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

Merge pull request #1424 from mtkennerly/bugfix/pane-grid-undraggable-area-when-cramped

Browse source 
When pane grid title bar is cramped, still show content until hover and allow dragging where content would've been
This commit is contained in:
Héctor Ramón 2022-08-27 11:53:36 +02:00 • committed by GitHub
commit 94fc3d993e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
native/src/widget/pane_grid/title_bar.rs
View file

@ -144,6 +144,7 @@ where
let mut show_title = true; let mut show_title = true;
if let Some(controls) = &self.controls { if let Some(controls) = &self.controls {
if show_controls || self.always_show_controls {
let controls_layout = children.next().unwrap(); let controls_layout = children.next().unwrap();
if title_layout.bounds().width + controls_layout.bounds().width if title_layout.bounds().width + controls_layout.bounds().width
> padded.bounds().width > padded.bounds().width
@ -151,7 +152,6 @@ where
show_title = false; show_title = false;
} }
if show_controls || self.always_show_controls {
controls.as_widget().draw( controls.as_widget().draw(
&tree.children[1], &tree.children[1],
renderer, renderer,
@ -195,8 +195,14 @@ where
if self.controls.is_some() { if self.controls.is_some() {
let controls_layout = children.next().unwrap(); let controls_layout = children.next().unwrap();
if title_layout.bounds().width + controls_layout.bounds().width
> padded.bounds().width
{
!controls_layout.bounds().contains(cursor_position)
} else {
!controls_layout.bounds().contains(cursor_position) !controls_layout.bounds().contains(cursor_position)
&& !title_layout.bounds().contains(cursor_position) && !title_layout.bounds().contains(cursor_position)
}
} else { } else {
!title_layout.bounds().contains(cursor_position) !title_layout.bounds().contains(cursor_position)
} }