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

Rename overlay::Content trait to Overlay

Browse source 
The `Overlay` struct is now `overlay::Element`.
This commit is contained in:
Héctor Ramón Jiménez 2020-07-10 01:31:56 +02:00
parent ce8cb228ef
commit 1070b61f34
12 changed files with 186 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

4
native/src/widget/column.rs
View file

@ -2,7 +2,7 @@
use std::hash::Hash;
use crate::{
layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Overlay,
layout, overlay, Align, Clipboard, Element, Event, Hasher, Layout, Length,
Point, Widget,
};
@ -208,7 +208,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'_, Message, Renderer>> {
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.children
.iter_mut()
.zip(layout.children())

8
native/src/widget/combo_box.rs
View file

@ -1,8 +1,8 @@
use crate::{
layout, mouse,
layout, mouse, overlay,
overlay::menu::{self, Menu},
scrollable, text, Clipboard, Element, Event, Hasher, Layout, Length,
Overlay, Point, Rectangle, Size, Widget,
scrollable, text, Clipboard, Element, Event, Hasher, Layout, Length, Point,
Rectangle, Size, Widget,
};
use std::borrow::Cow;
@ -225,7 +225,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'_, Message, Renderer>> {
) -> Option<overlay::Element<'_, Message, Renderer>> {
if self.menu.is_open() {
let bounds = layout.bounds();

4
native/src/widget/container.rs
View file

@ -2,7 +2,7 @@
use std::hash::Hash;
use crate::{
layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Overlay,
layout, overlay, Align, Clipboard, Element, Event, Hasher, Layout, Length,
Point, Rectangle, Widget,
};
@ -218,7 +218,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'_, Message, Renderer>> {
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.content.overlay(layout.children().next().unwrap())
}
}

4
native/src/widget/row.rs
View file

@ -2,7 +2,7 @@
use std::hash::Hash;
use crate::{
layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Overlay,
layout, overlay, Align, Clipboard, Element, Event, Hasher, Layout, Length,
Point, Widget,
};
@ -210,7 +210,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'_, Message, Renderer>> {
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.children
.iter_mut()
.zip(layout.children())

6
native/src/widget/scrollable.rs
View file

@ -1,7 +1,7 @@
//! Navigate an endless amount of content with a scrollbar.
use crate::{
column, layout, mouse, Align, Clipboard, Column, Element, Event, Hasher,
Layout, Length, Overlay, Point, Rectangle, Size, Vector, Widget,
column, layout, mouse, overlay, Align, Clipboard, Column, Element, Event,
Hasher, Layout, Length, Point, Rectangle, Size, Vector, Widget,
};
use std::{f32, hash::Hash, u32};
@ -319,7 +319,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
) -> Option<Overlay<'_, Message, Renderer>> {
) -> Option<overlay::Element<'_, Message, Renderer>> {
let Self { content, state, .. } = self;
content