summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-02-23 03:12:00 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-02-23 03:12:00 +0100
commit9f60a256fc909dda0c30e301020d03d7ec28d722 (patch)
tree6f16a5c0e1516c1c9478977c90969d76c2738cda /native
parent81c75c15249b608dd8a6d47e25f96feb10ca68da (diff)
downloadiced-9f60a256fc909dda0c30e301020d03d7ec28d722.tar.gz
iced-9f60a256fc909dda0c30e301020d03d7ec28d722.tar.bz2
iced-9f60a256fc909dda0c30e301020d03d7ec28d722.zip
Remove `viewport` from `Overlay::draw` for now
Diffstat (limited to 'native')
-rw-r--r--native/src/overlay.rs2
-rw-r--r--native/src/overlay/element.rs8
-rw-r--r--native/src/overlay/menu.rs1
-rw-r--r--native/src/user_interface.rs1
4 files changed, 2 insertions, 10 deletions
diff --git a/native/src/overlay.rs b/native/src/overlay.rs
index 20e3ee92..ea8bb384 100644
--- a/native/src/overlay.rs
+++ b/native/src/overlay.rs
@@ -4,7 +4,6 @@ mod element;
pub mod menu;
pub use element::Element;
-use iced_core::Rectangle;
pub use menu::Menu;
use crate::event::{self, Event};
@@ -36,7 +35,6 @@ where
defaults: &Renderer::Defaults,
layout: Layout<'_>,
cursor_position: Point,
- viewport: &Rectangle,
) -> Renderer::Output;
/// Computes the _layout_ hash of the [`Overlay`].
diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index fbe05d31..0f44a781 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -1,5 +1,3 @@
-use iced_core::Rectangle;
-
pub use crate::Overlay;
use crate::event::{self, Event};
@@ -76,10 +74,9 @@ where
defaults: &Renderer::Defaults,
layout: Layout<'_>,
cursor_position: Point,
- viewport: &Rectangle,
) -> Renderer::Output {
self.overlay
- .draw(renderer, defaults, layout, cursor_position, viewport)
+ .draw(renderer, defaults, layout, cursor_position)
}
/// Computes the _layout_ hash of the [`Element`].
@@ -148,10 +145,9 @@ where
defaults: &Renderer::Defaults,
layout: Layout<'_>,
cursor_position: Point,
- viewport: &Rectangle,
) -> Renderer::Output {
self.content
- .draw(renderer, defaults, layout, cursor_position, viewport)
+ .draw(renderer, defaults, layout, cursor_position)
}
fn hash_layout(&self, state: &mut Hasher, position: Point) {
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index c920e86e..5ad1391f 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -239,7 +239,6 @@ where
defaults: &Renderer::Defaults,
layout: Layout<'_>,
cursor_position: Point,
- _viewport: &Rectangle,
) -> Renderer::Output {
let primitives = self.container.draw(
renderer,
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index d1835b65..7a64ac59 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -351,7 +351,6 @@ where
&Renderer::Defaults::default(),
Layout::new(&layer.layout),
cursor_position,
- &viewport,
);
self.overlay = Some(layer);