From e7921d0ac6159c4ad7119badacb095ad73c8b485 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 13 May 2024 18:41:33 -0400
Subject: [PATCH] fix: icon updates

---
 .../src/pages/desktop/panel/applets_inner.rs   | 18 ++++++++----------
 .../src/pages/input/keyboard/mod.rs            |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
index 78ce7dc..b7555b2 100644
--- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
@@ -1,6 +1,7 @@
 use button::StyleSheet as ButtonStyleSheet;
 use cosmic::iced_style::container::StyleSheet;
 
+use cosmic::prelude::CollectionWidget;
 use cosmic::widget::{
     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);
                 container(
                     row::with_children(vec![
-                        icon::from_name("open-menu-symbolic")
+                        icon::from_name("grip-lines-symbolic")
                             .symbolic(true)
                             .size(16)
                             .into(),
@@ -680,16 +681,16 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
                             .spacing(4.0)
                             .width(Length::Fill)
                             .push(text(info.name))
-                            .push(text::caption(info.description))
+                            .push_maybe(if info.description.is_empty() {
+                                None
+                            } else {
+                                Some(text::caption(info.description))
+                            })
                             .into(),
                         button::icon(icon::from_name("edit-delete-symbolic"))
                             .extra_small()
                             .on_press(on_remove(id_clone.clone()))
                             .into(),
-                        button::icon(icon::from_name("open-menu-symbolic"))
-                            .extra_small()
-                            .on_press(on_details(id_clone))
-                            .into(),
                     ])
                     .spacing(12)
                     .align_items(Alignment::Center),
@@ -760,7 +761,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
             inner: if let Some(info) = state.dragged_applet() {
                 container(
                     row::with_children(vec![
-                        icon::from_name("open-menu-symbolic")
+                        icon::from_name("grip-lines-symbolic")
                             .size(16)
                             .symbolic(true)
                             .into(),
@@ -774,9 +775,6 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
                         button::icon(icon::from_name("edit-delete-symbolic"))
                             .extra_small()
                             .into(),
-                        button::icon(icon::from_name("open-menu-symbolic"))
-                            .extra_small()
-                            .into(),
                     ])
                     .spacing(12)
                     .align_items(Alignment::Center),
diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs
index 91b8316..5b308b2 100644
--- a/cosmic-settings/src/pages/input/keyboard/mod.rs
+++ b/cosmic-settings/src/pages/input/keyboard/mod.rs
@@ -183,7 +183,7 @@ fn popover_menu(id: DefaultKey) -> 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 button = button::icon(icon::from_name("open-menu-symbolic"))
+    let button = button::icon(icon::from_name("view-more-symbolic"))
         .extra_small()
         .on_press(on_press);