Restore dropdown files to master
This commit is contained in:
parent
91bc09172b
commit
16b0d6e4dc
2 changed files with 15 additions and 15 deletions
|
|
@ -9,14 +9,14 @@ use std::sync::{Arc, Mutex};
|
||||||
pub use appearance::{Appearance, StyleSheet};
|
pub use appearance::{Appearance, StyleSheet};
|
||||||
|
|
||||||
use crate::surface;
|
use crate::surface;
|
||||||
use crate::widget::{icon, Container, RcWrapper};
|
use crate::widget::{Container, RcWrapper, icon};
|
||||||
use iced_core::event::{self, Event};
|
use iced_core::event::{self, Event};
|
||||||
use iced_core::layout::{self, Layout};
|
use iced_core::layout::{self, Layout};
|
||||||
use iced_core::text::{self, Text};
|
use iced_core::text::{self, Text};
|
||||||
use iced_core::widget::Tree;
|
use iced_core::widget::Tree;
|
||||||
use iced_core::{
|
use iced_core::{
|
||||||
alignment, mouse, overlay, renderer, svg, touch, Border, Clipboard, Element, Length, Padding,
|
Border, Clipboard, Element, Length, Padding, Pixels, Point, Rectangle, Renderer, Shadow, Shell,
|
||||||
Pixels, Point, Rectangle, Renderer, Shadow, Shell, Size, Vector, Widget,
|
Size, Vector, Widget, alignment, mouse, overlay, renderer, svg, touch,
|
||||||
};
|
};
|
||||||
use iced_widget::scrollable::Scrollable;
|
use iced_widget::scrollable::Scrollable;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,19 +2,19 @@
|
||||||
// Copyright 2019 Héctor Ramón, Iced contributors
|
// Copyright 2019 Héctor Ramón, Iced contributors
|
||||||
// SPDX-License-Identifier: MPL-2.0 AND MIT
|
// SPDX-License-Identifier: MPL-2.0 AND MIT
|
||||||
|
|
||||||
use super::menu::{self, Menu};
|
|
||||||
use super::Id;
|
use super::Id;
|
||||||
|
use super::menu::{self, Menu};
|
||||||
use crate::widget::icon::{self, Handle};
|
use crate::widget::icon::{self, Handle};
|
||||||
use crate::{surface, Element};
|
use crate::{Element, surface};
|
||||||
use derive_setters::Setters;
|
use derive_setters::Setters;
|
||||||
use iced::window;
|
use iced::window;
|
||||||
use iced_core::event::{self, Event};
|
use iced_core::event::{self, Event};
|
||||||
use iced_core::text::{self, Paragraph, Text};
|
use iced_core::text::{self, Paragraph, Text};
|
||||||
use iced_core::widget::tree::{self, Tree};
|
use iced_core::widget::tree::{self, Tree};
|
||||||
use iced_core::{alignment, keyboard, layout, mouse, overlay, renderer, svg, touch, Shadow};
|
|
||||||
use iced_core::{
|
use iced_core::{
|
||||||
Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget,
|
Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget,
|
||||||
};
|
};
|
||||||
|
use iced_core::{Shadow, alignment, keyboard, layout, mouse, overlay, renderer, svg, touch};
|
||||||
use iced_widget::pick_list::{self, Catalog};
|
use iced_widget::pick_list::{self, Catalog};
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
|
|
@ -165,10 +165,10 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<
|
impl<
|
||||||
S: AsRef<str> + Send + Sync + Clone + 'static,
|
S: AsRef<str> + Send + Sync + Clone + 'static,
|
||||||
Message: 'static + Clone,
|
Message: 'static + Clone,
|
||||||
AppMessage: 'static + Clone,
|
AppMessage: 'static + Clone,
|
||||||
> Widget<Message, crate::Theme, crate::Renderer> for Dropdown<'_, S, Message, AppMessage>
|
> Widget<Message, crate::Theme, crate::Renderer> for Dropdown<'_, S, Message, AppMessage>
|
||||||
where
|
where
|
||||||
[S]: std::borrow::ToOwned,
|
[S]: std::borrow::ToOwned,
|
||||||
{
|
{
|
||||||
|
|
@ -384,11 +384,11 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<
|
impl<
|
||||||
'a,
|
'a,
|
||||||
S: AsRef<str> + Send + Sync + Clone + 'static,
|
S: AsRef<str> + Send + Sync + Clone + 'static,
|
||||||
Message: 'static + std::clone::Clone,
|
Message: 'static + std::clone::Clone,
|
||||||
AppMessage: 'static + std::clone::Clone,
|
AppMessage: 'static + std::clone::Clone,
|
||||||
> From<Dropdown<'a, S, Message, AppMessage>> for crate::Element<'a, Message>
|
> From<Dropdown<'a, S, Message, AppMessage>> for crate::Element<'a, Message>
|
||||||
where
|
where
|
||||||
[S]: std::borrow::ToOwned,
|
[S]: std::borrow::ToOwned,
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue