leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: icon updates

Browse source
This commit is contained in:
Ashley Wulber 2024-05-13 18:41:33 -04:00 • committed by Michael Murphy
parent bed629563e
commit e7921d0ac6
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cosmic-settings/src/pages/desktop/panel/applets_inner.rs
View file

@ -1,6 +1,7 @@
use button::StyleSheet as ButtonStyleSheet; use button::StyleSheet as ButtonStyleSheet;
use cosmic::iced_style::container::StyleSheet; use cosmic::iced_style::container::StyleSheet;
use cosmic::prelude::CollectionWidget;
use cosmic::widget::{ use cosmic::widget::{
button, column, container, horizontal_space, icon, list_column, row, text, text_input, Column, button, column, container, horizontal_space, icon, list_column, row, text, text_input, Column,
}; };
@ -671,7 +672,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
let is_dragged = active_dnd.as_ref().map_or(false, |dnd| dnd.id == info.id); let is_dragged = active_dnd.as_ref().map_or(false, |dnd| dnd.id == info.id);
container( container(
row::with_children(vec![ row::with_children(vec![
icon::from_name("open-menu-symbolic") icon::from_name("grip-lines-symbolic")
.symbolic(true) .symbolic(true)
.size(16) .size(16)
.into(), .into(),
@ -680,16 +681,16 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
.spacing(4.0) .spacing(4.0)
.width(Length::Fill) .width(Length::Fill)
.push(text(info.name)) .push(text(info.name))
.push(text::caption(info.description)) .push_maybe(if info.description.is_empty() {
None
} else {
Some(text::caption(info.description))
})
.into(), .into(),
button::icon(icon::from_name("edit-delete-symbolic")) button::icon(icon::from_name("edit-delete-symbolic"))
.extra_small() .extra_small()
.on_press(on_remove(id_clone.clone())) .on_press(on_remove(id_clone.clone()))
.into(), .into(),
button::icon(icon::from_name("open-menu-symbolic"))
.extra_small()
.on_press(on_details(id_clone))
.into(),
]) ])
.spacing(12) .spacing(12)
.align_items(Alignment::Center), .align_items(Alignment::Center),
@ -760,7 +761,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
inner: if let Some(info) = state.dragged_applet() { inner: if let Some(info) = state.dragged_applet() {
container( container(
row::with_children(vec![ row::with_children(vec![
icon::from_name("open-menu-symbolic") icon::from_name("grip-lines-symbolic")
.size(16) .size(16)
.symbolic(true) .symbolic(true)
.into(), .into(),
@ -774,9 +775,6 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
button::icon(icon::from_name("edit-delete-symbolic")) button::icon(icon::from_name("edit-delete-symbolic"))
.extra_small() .extra_small()
.into(), .into(),
button::icon(icon::from_name("open-menu-symbolic"))
.extra_small()
.into(),
]) ])
.spacing(12) .spacing(12)
.align_items(Alignment::Center), .align_items(Alignment::Center),

2
cosmic-settings/src/pages/input/keyboard/mod.rs
View file

@ -183,7 +183,7 @@ fn popover_menu(id: DefaultKey) -> cosmic::Element<'static, Message> {
fn popover_button(id: DefaultKey, expanded: bool) -> cosmic::Element<'static, Message> { fn popover_button(id: DefaultKey, expanded: bool) -> cosmic::Element<'static, Message> {
let on_press = Message::ExpandInputSourcePopover(if expanded { None } else { Some(id) }); let on_press = Message::ExpandInputSourcePopover(if expanded { None } else { Some(id) });
let button = button::icon(icon::from_name("open-menu-symbolic")) let button = button::icon(icon::from_name("view-more-symbolic"))
.extra_small() .extra_small()
.on_press(on_press); .on_press(on_press);