diff --git a/src/widget/dropdown/menu/mod.rs b/src/widget/dropdown/menu/mod.rs index d6558c3c..ee8dc7ac 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::{Container, RcWrapper, icon}; +use crate::widget::{icon, Container, RcWrapper}; 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::{ - Border, Clipboard, Element, Length, Padding, Pixels, Point, Rectangle, Renderer, Shadow, Shell, - Size, Vector, Widget, alignment, mouse, overlay, renderer, svg, touch, + alignment, mouse, overlay, renderer, svg, touch, Border, Clipboard, Element, Length, Padding, + Pixels, Point, Rectangle, Renderer, Shadow, Shell, Size, Vector, Widget, }; use iced_widget::scrollable::Scrollable; @@ -666,7 +666,7 @@ where }; bounds.x += 24.0; - icon::draw_with_scale(renderer, handle, icon_bounds, style.scale_factor as f32); + icon::draw(renderer, handle, icon_bounds); } text::Renderer::fill_text( diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs index 7c8171f6..a8929320 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::Id; use super::menu::{self, Menu}; +use super::Id; use crate::widget::icon::{self, Handle}; -use crate::{Element, surface}; +use crate::{surface, Element}; 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, { @@ -302,7 +302,7 @@ where tree: &Tree, renderer: &mut crate::Renderer, theme: &crate::Theme, - style: &iced_core::renderer::Style, + _style: &iced_core::renderer::Style, layout: Layout<'_>, cursor: mouse::Cursor, viewport: &Rectangle, @@ -311,7 +311,6 @@ where draw( renderer, theme, - style, layout, cursor, self.gap, @@ -385,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, { @@ -864,7 +863,6 @@ where pub fn draw<'a, S>( renderer: &mut crate::Renderer, theme: &crate::Theme, - renderer_style: &iced_core::renderer::Style, layout: Layout<'_>, cursor: mouse::Cursor, gap: f32, @@ -930,12 +928,7 @@ pub fn draw<'a, S>( }; bounds.x += 24.0; - icon::draw_with_scale( - renderer, - handle, - icon_bounds, - renderer_style.scale_factor as f32, - ); + icon::draw(renderer, handle, icon_bounds); } text::Renderer::fill_text(