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

Merge pull request #771 from hecrj/fix/tooltip-layering

Browse source 
Reposition `Tooltip` inside `viewport` bounds
This commit is contained in:
Héctor Ramón 2021-03-10 03:28:04 +01:00 • committed by GitHub
commit 939fcfe9db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ use crate::event::{self, Event};
use crate::layout;
use crate::overlay;
use crate::pane_grid::{self, TitleBar};
use crate::{Clipboard, Element, Hasher, Layout, Point, Size};
use crate::{Clipboard, Element, Hasher, Layout, Point, Rectangle, Size};
/// The content of a [`Pane`].
///
@ -60,6 +60,7 @@ where
defaults: &Renderer::Defaults,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
) -> Renderer::Output {
if let Some(title_bar) = &self.title_bar {
let mut children = layout.children();
@ -73,6 +74,7 @@ where
Some((title_bar, title_bar_layout)),
(&self.body, body_layout),
cursor_position,
viewport,
)
} else {
renderer.draw_pane(
@ -82,6 +84,7 @@ where
None,
(&self.body, layout),
cursor_position,
viewport,
)
}
}

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

@ -2,7 +2,7 @@ use crate::container;
use crate::event::{self, Event};
use crate::layout;
use crate::pane_grid;
use crate::{Clipboard, Element, Hasher, Layout, Point, Size};
use crate::{Clipboard, Element, Hasher, Layout, Point, Rectangle, Size};
/// The title bar of a [`Pane`].
///
@ -85,6 +85,7 @@ where
defaults: &Renderer::Defaults,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
show_controls: bool,
) -> Renderer::Output {
let mut children = layout.children();
@ -112,6 +113,7 @@ where
(&self.content, title_layout),
controls,
cursor_position,
viewport,
)
}