From 16b0d6e4dc59a1a8e7b2d27f985013960458a343 Mon Sep 17 00:00:00 2001 From: Anthony Firn Date: Fri, 3 Apr 2026 08:02:14 -0700 Subject: [PATCH] Restore dropdown files to master --- src/widget/dropdown/menu/mod.rs | 6 +++--- src/widget/dropdown/widget.rs | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/widget/dropdown/menu/mod.rs b/src/widget/dropdown/menu/mod.rs index ee8dc7ac..0c96c1c6 100644 --- a/src/widget/dropdown/menu/mod.rs +++ b/src/widget/dropdown/menu/mod.rs @@ -9,14 +9,14 @@ use std::sync::{Arc, Mutex}; pub use appearance::{Appearance, StyleSheet}; use crate::surface; -use crate::widget::{icon, Container, RcWrapper}; +use crate::widget::{Container, RcWrapper, icon}; use iced_core::event::{self, Event}; use iced_core::layout::{self, Layout}; use iced_core::text::{self, Text}; use iced_core::widget::Tree; use iced_core::{ - alignment, mouse, overlay, renderer, svg, touch, Border, Clipboard, Element, Length, Padding, - Pixels, Point, Rectangle, Renderer, Shadow, Shell, Size, Vector, Widget, + Border, Clipboard, Element, Length, Padding, Pixels, Point, Rectangle, Renderer, Shadow, Shell, + Size, Vector, Widget, alignment, mouse, overlay, renderer, svg, touch, }; use iced_widget::scrollable::Scrollable; diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs index a8929320..2ff9c92f 100644 --- a/src/widget/dropdown/widget.rs +++ b/src/widget/dropdown/widget.rs @@ -2,19 +2,19 @@ // Copyright 2019 Héctor Ramón, Iced contributors // SPDX-License-Identifier: MPL-2.0 AND MIT -use super::menu::{self, Menu}; use super::Id; +use super::menu::{self, Menu}; use crate::widget::icon::{self, Handle}; -use crate::{surface, Element}; +use crate::{Element, surface}; use derive_setters::Setters; use iced::window; use iced_core::event::{self, Event}; use iced_core::text::{self, Paragraph, Text}; use iced_core::widget::tree::{self, Tree}; -use iced_core::{alignment, keyboard, layout, mouse, overlay, renderer, svg, touch, Shadow}; use iced_core::{ 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 std::borrow::Cow; use std::ffi::OsStr; @@ -165,10 +165,10 @@ where } impl< - S: AsRef + Send + Sync + Clone + 'static, - Message: 'static + Clone, - AppMessage: 'static + Clone, - > Widget for Dropdown<'_, S, Message, AppMessage> + S: AsRef + Send + Sync + Clone + 'static, + Message: 'static + Clone, + AppMessage: 'static + Clone, +> Widget for Dropdown<'_, S, Message, AppMessage> where [S]: std::borrow::ToOwned, { @@ -384,11 +384,11 @@ where } impl< - 'a, - S: AsRef + Send + Sync + Clone + 'static, - Message: 'static + std::clone::Clone, - AppMessage: 'static + std::clone::Clone, - > From> for crate::Element<'a, Message> + 'a, + S: AsRef + Send + Sync + Clone + 'static, + Message: 'static + std::clone::Clone, + AppMessage: 'static + std::clone::Clone, +> From> for crate::Element<'a, Message> where [S]: std::borrow::ToOwned, {