leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop unused dropdown icon plumbing

Browse source
This commit is contained in:
Anthony Firn 2026-04-03 08:01:21 -07:00
parent 1c5171aff2
commit 91bc09172b
2 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/widget/dropdown/menu/mod.rs
View file

@ -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::{Container, RcWrapper, icon}; use crate::widget::{icon, Container, RcWrapper};
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::{
Border, Clipboard, Element, Length, Padding, Pixels, Point, Rectangle, Renderer, Shadow, Shell, alignment, mouse, overlay, renderer, svg, touch, Border, Clipboard, Element, Length, Padding,
Size, Vector, Widget, alignment, mouse, overlay, renderer, svg, touch, Pixels, Point, Rectangle, Renderer, Shadow, Shell, Size, Vector, Widget,
}; };
use iced_widget::scrollable::Scrollable; use iced_widget::scrollable::Scrollable;
@ -666,7 +666,7 @@ where
}; };
bounds.x += 24.0; 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( text::Renderer::fill_text(

35
src/widget/dropdown/widget.rs
View file

@ -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::Id;
use super::menu::{self, Menu}; use super::menu::{self, Menu};
use super::Id;
use crate::widget::icon::{self, Handle}; use crate::widget::icon::{self, Handle};
use crate::{Element, surface}; use crate::{surface, Element};
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,
{ {
@ -302,7 +302,7 @@ where
tree: &Tree, tree: &Tree,
renderer: &mut crate::Renderer, renderer: &mut crate::Renderer,
theme: &crate::Theme, theme: &crate::Theme,
style: &iced_core::renderer::Style, _style: &iced_core::renderer::Style,
layout: Layout<'_>, layout: Layout<'_>,
cursor: mouse::Cursor, cursor: mouse::Cursor,
viewport: &Rectangle, viewport: &Rectangle,
@ -311,7 +311,6 @@ where
draw( draw(
renderer, renderer,
theme, theme,
style,
layout, layout,
cursor, cursor,
self.gap, self.gap,
@ -385,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,
{ {
@ -864,7 +863,6 @@ where
pub fn draw<'a, S>( pub fn draw<'a, S>(
renderer: &mut crate::Renderer, renderer: &mut crate::Renderer,
theme: &crate::Theme, theme: &crate::Theme,
renderer_style: &iced_core::renderer::Style,
layout: Layout<'_>, layout: Layout<'_>,
cursor: mouse::Cursor, cursor: mouse::Cursor,
gap: f32, gap: f32,
@ -930,12 +928,7 @@ pub fn draw<'a, S>(
}; };
bounds.x += 24.0; bounds.x += 24.0;
icon::draw_with_scale( icon::draw(renderer, handle, icon_bounds);
renderer,
handle,
icon_bounds,
renderer_style.scale_factor as f32,
);
} }
text::Renderer::fill_text( text::Renderer::fill_text(