fix: padding, spacing, context menu style, and settings buttons

Author: git-f0x

Cargo.lock

@@ -41,7 +41,7 @@ use cosmic::{
         accept_mime_type, finish_dnd, request_dnd_data, set_actions, start_drag,
     },
     iced_style::{application, svg},
-    theme::{Button, Container},
+    theme::{self, Button, Container},
     widget::{
         button, divider, horizontal_space, icon,
         icon::from_name,
@@ -62,7 +62,7 @@ use futures::future::pending;
 use iced::{widget::container, Alignment, Background, Length};
 use itertools::Itertools;
 use rand::{thread_rng, Rng};
-use std::{collections::HashMap, fs, path::PathBuf, rc::Rc, str::FromStr, time::Duration};
+use std::{collections::HashMap, path::PathBuf, rc::Rc, str::FromStr, time::Duration};
 use switcheroo_control::Gpu;
 use tokio::time::sleep;
 use url::Url;
@@ -262,7 +262,7 @@ impl DockItem {
             .into(),
         };
 
-        let icon_button = cosmic::widget::button(icon_wrapper)
+        let icon_button = button::custom(icon_wrapper)
             .padding(app_icon.padding)
             .selected(is_focused)
             .style(app_list_icon_style(is_focused));
@@ -456,7 +456,7 @@ where
     Msg: 'static + Clone,
 {
     let border = 1.0;
-    cosmic::widget::button(
+    button::custom(
         container(
             column![
                 container(if let Some(img) = img {
@@ -1715,14 +1715,14 @@ impl cosmic::Application for CosmicAppList {
                     fn menu_button<'a, Message>(
                         content: impl Into<Element<'a, Message>>,
                     ) -> cosmic::widget::Button<'a, Message> {
-                        cosmic::widget::button(content)
-                            .height(36)
-                            .style(Button::AppletMenu)
+                        button::custom(content)
+                            .height(20 + 2 * theme::active().cosmic().space_xxs())
+                            .style(Button::MenuItem)
                             .padding(menu_control_padding())
                             .width(Length::Fill)
                     }
 
-                    let mut content = column![].padding([8, 0]).align_items(Alignment::Center);
+                    let mut content = column![].align_items(Alignment::Center);
 
                     if let Some(exec) = desktop_info.exec() {
                         if !toplevels.is_empty() {
@@ -1774,7 +1774,7 @@ impl cosmic::Application for CosmicAppList {
                                     .on_press(Message::Exec(exec.into(), None)),
                             );
                         }
-                        content = content.push(divider::horizontal::default());
+                        content = content.push(divider::horizontal::light());
                     }
 
                     if !toplevels.is_empty() {
@@ -1791,7 +1791,7 @@ impl cosmic::Application for CosmicAppList {
                             );
                         }
                         content = content.push(list_col);
-                        content = content.push(divider::horizontal::default());
+                        content = content.push(divider::horizontal::light());
                     }
 
                     let svg_accent = Rc::new(|theme: &cosmic::Theme| {
@@ -1820,7 +1820,7 @@ impl cosmic::Application for CosmicAppList {
                     );
 
                     if toplevels.len() > 0 {
-                        content = content.push(divider::horizontal::default());
+                        content = content.push(divider::horizontal::light());
                         content = match toplevels.len() {
                             1 => content.push(
                                 menu_button(text::body(fl!("quit")))
@@ -1832,7 +1832,26 @@ impl cosmic::Application for CosmicAppList {
                             ),
                         };
                     }
-                    self.core.applet.popup_container(content).into()
+                    container(content)
+                        .padding(1)
+                        //TODO: move style to libcosmic
+                        .style(theme::Container::custom(|theme| {
+                            let cosmic = theme.cosmic();
+                            let component = &cosmic.background.component;
+                            container::Appearance {
+                                icon_color: Some(component.on.into()),
+                                text_color: Some(component.on.into()),
+                                background: Some(Background::Color(component.base.into())),
+                                border: Border {
+                                    radius: 8.0.into(),
+                                    width: 1.0,
+                                    color: component.divider.into(),
+                                },
+                                ..Default::default()
+                            }
+                        }))
+                        .width(Length::Fill)
+                        .into()
                 }
                 PopupType::TopLevelList => match self.core.applet.anchor {
                     PanelAnchor::Left | PanelAnchor::Right => {

cosmic-app-list/src/app.rs

@@ -1,6 +1,6 @@
 output = Output
 input = Input
-show-media-controls = Show Media Controls on Top Panel
+show-media-controls = Show media controls on panel
 sound-settings = Sound Settings...
 disconnected = PulseAudio Disconnected
 no-device = No device selected

cosmic-applet-audio/i18n/en/cosmic_applet_audio.ftl

@@ -15,15 +15,17 @@ use cosmic::{
         menu_button, menu_control_padding, padded_control,
         token::subscription::{activation_token_subscription, TokenRequest, TokenUpdate},
     },
-    cctk::sctk::reexports::{calloop, protocols::xdg::shell::client::xdg_positioner::Anchor},
+    cctk::sctk::reexports::calloop,
     cosmic_config::CosmicConfigEntry,
+    cosmic_theme::Spacing,
     iced::{
         self,
         widget::{self, column, row, slider},
-        window, Alignment, Length, Limits, Rectangle, Subscription,
+        window, Alignment, Length, Limits, Subscription,
     },
     iced_runtime::core::alignment::Horizontal,
     iced_style::application,
+    theme,
     widget::{button, divider, horizontal_space, icon, text, Column, Row},
     Element, Renderer, Theme,
 };
@@ -665,6 +667,9 @@ impl cosmic::Application for Audio {
                         input.mute = value;
                     }
                 }
+                sub_pulse::Event::DefaultSink(_) => {}
+                sub_pulse::Event::DefaultSource(_) => {}
+                sub_pulse::Event::CardInfo(_) => {}
             },
         };
 
@@ -735,16 +740,19 @@ impl cosmic::Application for Audio {
     }
 
     fn view_window(&self, _id: window::Id) -> Element<Message> {
+        let Spacing {
+            space_xxs, space_s, ..
+        } = theme::active().cosmic().spacing;
+
         let audio_disabled = matches!(self.pulse_state, PulseState::Disconnected(_));
         let out_mute = self.current_output_mute();
         let in_mute = self.current_input_mute();
 
         let mut audio_content = if audio_disabled {
             column![padded_control(
-                text(fl!("disconnected"))
+                text::title3(fl!("disconnected"))
                     .width(Length::Fill)
                     .horizontal_alignment(Horizontal::Center)
-                    .size(24)
             )]
         } else {
             column![
@@ -790,7 +798,7 @@ impl cosmic::Application for Audio {
                     .spacing(12)
                     .align_items(Alignment::Center)
                 ),
-                padded_control(divider::horizontal::default()),
+                padded_control(divider::horizontal::default()).padding([space_xxs, space_s]),
                 revealer(
                     self.is_open == IsOpen::Output,
                     fl!("output"),
@@ -906,7 +914,8 @@ impl cosmic::Application for Audio {
                     .into(),
             );
 
-            audio_content = audio_content.push(padded_control(divider::horizontal::default()));
+            audio_content = audio_content
+                .push(padded_control(divider::horizontal::default()).padding([space_xxs, space_s]));
             audio_content = audio_content.push(
                 Row::with_children(elements)
                     .align_items(Alignment::Center)
@@ -916,7 +925,7 @@ impl cosmic::Application for Audio {
         }
         let content = column![
             audio_content,
-            padded_control(divider::horizontal::default()),
+            padded_control(divider::horizontal::default()).padding([space_xxs, space_s]),
             padded_control(
                 anim!(
                     // toggler
@@ -928,9 +937,8 @@ impl cosmic::Application for Audio {
                 )
                 .text_size(14)
                 .width(Length::Fill)
-            )
-            .padding([8, 24]),
-            padded_control(divider::horizontal::default()),
+            ),
+            padded_control(divider::horizontal::default()).padding([space_xxs, space_s]),
             menu_button(text::body(fl!("sound-settings"))).on_press(Message::OpenSettings)
         ]
         .align_items(Alignment::Start)

cosmic-applet-audio/src/lib.rs

@@ -1,4 +1,3 @@
-cosmic-applet-button = Cosmic Taste
 battery = Akku
 battery-desc = Reduzierter Stromverbrauch und Leistung.
 balanced = Ausgeglichen
@@ -12,4 +11,4 @@ hours = h
 until-empty = bis leer
 power-settings = Energie- und Akkueinstellungen...
 dgpu-running = Dedizierte GPU ist aktiv und kann die Akkulaufzeit reduzieren
-dgpu-applications = Anwendungen, die die dedizierte GPU {$gpu_name} nutzen
+dgpu-applications = Anwendungen, die die dedizierte GPU {$gpu_name} nutzen

cosmic-applet-battery/i18n/de/cosmic_applet_battery.ftl

@@ -1,4 +1,3 @@
-cosmic-applet-button = Cosmic Button
 battery = Battery
 battery-desc = Reduced power usage and performance.
 balanced = Balanced
@@ -10,6 +9,6 @@ seconds = s
 minutes = m
 hours = h
 until-empty = until empty
-power-settings = Power and Battery Settings...
+power-settings = Power & Battery settings...
 dgpu-running = Discrete GPU is active and can reduce battery life
-dgpu-applications = Applications using {$gpu_name} discrete GPU
+dgpu-applications = Applications using {$gpu_name} discrete GPU

cosmic-applet-battery/i18n/en/cosmic_applet_battery.ftl

@@ -1,4 +1,3 @@
-cosmic-applet-button = Botón de Cosmic
 battery = Ahorro de energía
 battery-desc = Rendimiento y uso de energía reducido.
 balanced = Balanceado

cosmic-applet-battery/i18n/es-419/cosmic_applet_battery.ftl

@@ -1,4 +1,3 @@
-cosmic-applet-button = Botón Cosmic
 battery = Batería
 battery-desc = Rendimiento y consumo de alimentación reducidos.
 balanced = Balanceado

cosmic-applet-battery/i18n/es-ES/cosmic_applet_battery.ftl

@@ -1,4 +1,3 @@
-cosmic-applet-button = دکمه Cosmic
 battery = باتری
 battery-desc = کاهش مصرف برق و عملکرد.
 balanced = متعادل

cosmic-applet-battery/i18n/fa/cosmic_applet_battery.ftl

@@ -1,4 +1,3 @@
-cosmic-applet-button = Cosmic Painike
 battery = Akku
 battery-desc = Vähentynyt virrankulutus ja suorituskyky.
 balanced = Tasapainoitettu