me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1480 from tarkah/more-pane-grid-fixes

Browse source 
More pane grid fixes
This commit is contained in:
Héctor Ramón 2022-10-19 23:32:12 +02:00 • committed by GitHub
commit 82217947aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
native/src/widget/pane_grid.rs
View file

@ -341,6 +341,7 @@ where
cursor_position,
viewport,
renderer,
self.on_drag.is_some(),
)
})
.max()
@ -648,7 +649,7 @@ pub fn mouse_interaction(
resize_leeway: Option<u16>,
) -> Option<mouse::Interaction> {
if action.picked_pane().is_some() {
return Some(mouse::Interaction::Grab);
return Some(mouse::Interaction::Grabbing);
}
let resize_axis =
@ -756,27 +757,12 @@ pub fn draw<Renderer, T>(
cursor_position
};
let mut render_picked_pane = None;
for ((id, pane), layout) in elements.zip(layout.children()) {
match picked_pane {
Some((dragging, origin)) if id == dragging => {
let bounds = layout.bounds();
renderer.with_translation(
cursor_position
- Point::new(bounds.x + origin.x, bounds.y + origin.y),
|renderer| {
renderer.with_layer(bounds, |renderer| {
draw_pane(
pane,
renderer,
default_style,
layout,
pane_cursor_position,
viewport,
);
});
},
);
render_picked_pane = Some((pane, origin, layout));
}
_ => {
draw_pane(
@ -791,6 +777,28 @@ pub fn draw<Renderer, T>(
}
}
// Render picked pane last
if let Some((pane, origin, layout)) = render_picked_pane {
let bounds = layout.bounds();
renderer.with_translation(
cursor_position
- Point::new(bounds.x + origin.x, bounds.y + origin.y),
|renderer| {
renderer.with_layer(bounds, |renderer| {
draw_pane(
pane,
renderer,
default_style,
layout,
pane_cursor_position,
viewport,
);
});
},
);
};
if let Some((axis, split_region, is_picked)) = picked_split {
let highlight = if is_picked {
theme.picked_split(style)

3
native/src/widget/pane_grid/content.rs
View file

@ -238,6 +238,7 @@ where
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
drag_enabled: bool,
) -> mouse::Interaction {
let (body_layout, title_bar_interaction) =
if let Some(title_bar) = &self.title_bar {
@ -247,7 +248,7 @@ where
let is_over_pick_area = title_bar
.is_over_pick_area(title_bar_layout, cursor_position);
if is_over_pick_area {
if is_over_pick_area && drag_enabled {
return mouse::Interaction::Grab;
}