Cosmic advanced text (#103)

* wip: update to use cosmic-advanced-text

* use cosmic-advanced-text branch of iced

* fix: line height and spacing for segmented button and update to get svg fix

* fix: spin button styling & spacing

* update iced to fix segmented button border radius

* feat: example improvements

* feat: helper for loading fonts

* feat: add focus style to button

* fix: slider height and iced fixed

* feat: hash icon width and height

* cleanup

* update ci

* refactor: always use lazy feature of iced

* update iced

* update iced

* cleanup & update iced

* update iced: new slider & tiny-skia quad updates

* update iced: fixes for tiny-skia quad rendering with edge case border radius

* re-export iced_runtime & iced_widget

* merge master

* udpate iced

* update iced

* update iced

* update iced

* fix: make rectangle_tracker subscription only return update if there is some

* feat: derive macro for loading a cosmic-config

* feat (cosmic-config): iced subscription

* fix (example): update to rectangle tracker subscription

* fix (cosmic-config)

* refactor(cosmic-config-derive): add support for types with generic parameters

* fix (cosmic-config): feature gate updates for subscription helpers

* feat: support for custom & system themes + move cosmic-theme to libcosmic

* feat: sorta hacky way of creating header bars for libcosmic + update iced to get support for resizable windows in iced-sctk

* update iced

* update and reexport sctk

* fix: applet border radius

* feat (cosmic-theme): add id and name methods

* fix(cosmic-theme): reexport palette from cosmic-theme

* fix(cosmic-config-derive): allow use with reexported cosmic-config

* feat: update iced with fix and refactor applet env vars

* update iced

examples/cosmic/src/window/demo.rs

@@ -1,9 +1,9 @@
 use apply::Apply;
 use cosmic::{
     cosmic_theme,
-    iced::widget::{checkbox, pick_list, progress_bar, radio, row, slider, text, text_input},
-    iced::{Alignment, Length},
-    theme::{self, Button as ButtonTheme, Theme},
+    iced::widget::{checkbox, column, pick_list, progress_bar, radio, slider, text, text_input},
+    iced::{id, Alignment, Length},
+    theme::{self, Button as ButtonTheme, Theme, ThemeType},
     widget::{
         button, container, icon, segmented_button, segmented_selection, settings, spin_button,
         toggler, view_switcher,
@@ -15,6 +15,33 @@ use once_cell::sync::Lazy;
 
 use super::{Page, Window};
 
+#[derive(Clone, Copy, Debug, PartialEq, PartialOrd, Ord, Eq)]
+pub enum ThemeVariant {
+    Light,
+    Dark,
+    HighContrastDark,
+    HighContrastLight,
+    Custom,
+}
+
+impl From<&ThemeType> for ThemeVariant {
+    fn from(theme: &ThemeType) -> Self {
+        match theme {
+            ThemeType::Light => ThemeVariant::Light,
+            ThemeType::Dark => ThemeVariant::Dark,
+            ThemeType::HighContrastDark => ThemeVariant::HighContrastDark,
+            ThemeType::HighContrastLight => ThemeVariant::HighContrastLight,
+            ThemeType::Custom(_) => ThemeVariant::Custom,
+        }
+    }
+}
+
+impl From<ThemeType> for ThemeVariant {
+    fn from(theme: ThemeType) -> Self {
+        ThemeVariant::from(&theme)
+    }
+}
+
 pub enum DemoView {
     TabA,
     TabB,
@@ -29,7 +56,7 @@ pub enum MultiOption {
     OptionD,
     OptionE,
 }
-static INPUT_ID: Lazy<text_input::Id> = Lazy::new(text_input::Id::unique);
+static INPUT_ID: Lazy<id::Id> = Lazy::new(id::Id::unique);
 
 #[derive(Clone, Debug)]
 pub enum Message {
@@ -44,7 +71,7 @@ pub enum Message {
     Selection(segmented_button::Entity),
     SliderChanged(f32),
     SpinButton(spin_button::Message),
-    ThemeChanged(Theme),
+    ThemeChanged(ThemeVariant),
     ToggleWarning,
     TogglerToggled(bool),
     ViewSwitcher(segmented_button::Entity),
@@ -54,7 +81,7 @@ pub enum Message {
 pub enum Output {
     Debug(bool),
     ScalingFactor(f32),
-    ThemeChanged(Theme),
+    ThemeChanged(ThemeVariant),
     ToggleWarning,
 }
 
@@ -151,20 +178,21 @@ impl State {
 
     pub(super) fn view<'a>(&'a self, window: &'a Window) -> Element<'a, Message> {
         let choose_theme = [
-            Theme::light(),
-            Theme::dark(),
-            Theme::light_hc(),
-            Theme::dark_hc(),
+            ThemeVariant::Light,
+            ThemeVariant::Dark,
+            ThemeVariant::HighContrastLight,
+            ThemeVariant::HighContrastLight,
+            ThemeVariant::Custom,
         ]
-        .iter()
+        .into_iter()
         .fold(
-            row![].spacing(10).align_items(Alignment::Center),
+            column![].spacing(10).align_items(Alignment::Center),
             |row, theme| {
                 row.push(radio(
-                    format!("{:?}", theme.theme_type),
-                    *theme,
-                    if window.theme == *theme {
-                        Some(*theme)
+                    format!("{:?}", theme),
+                    theme,
+                    if ThemeVariant::from(&window.theme.theme_type) == theme {
+                        Some(theme)
                     } else {
                         None
                     },
@@ -253,13 +281,14 @@ impl State {
                         .add(settings::item(
                             "Slider",
                             slider(0.0..=100.0, self.slider_value, Message::SliderChanged)
-                                .width(Length::Units(250)),
+                                .width(Length::Fixed(250.0))
+                                .height(38),
                         ))
                         .add(settings::item(
                             "Progress",
                             progress_bar(0.0..=100.0, self.slider_value)
-                                .width(Length::Units(250))
-                                .height(Length::Units(4)),
+                                .width(Length::Fixed(250.0))
+                                .height(Length::Fixed(4.0)),
                         ))
                         .add(settings::item_row(vec![checkbox(
                             "Checkbox",
@@ -401,8 +430,8 @@ impl State {
             text_input(
                 "Type to search apps or type “?” for more options...",
                 &self.entry_value,
-                Message::InputChanged,
             )
+            .on_input(Message::InputChanged)
             // .on_submit(Message::Activate(None))
             .padding(8)
             .size(20)

examples/cosmic/src/window/desktop.rs

@@ -219,10 +219,10 @@ impl State {
             for image_path in chunk.iter() {
                 image_row.push(if image_path.ends_with(".svg") {
                     svg(svg::Handle::from_path(image_path))
-                        .width(Length::Units(150))
+                        .width(Length::Fixed(150.0))
                         .into()
                 } else {
-                    image(image_path).width(Length::Units(150)).into()
+                    image(image_path).width(Length::Fixed(150.0)).into()
                 });
             }
             image_column.push(row(image_row).spacing(16).into());
@@ -234,7 +234,7 @@ impl State {
                 horizontal_space(Length::Fill),
                 container(
                     image("/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png")
-                        .width(Length::Units(300))
+                        .width(Length::Fixed(300.0))
                 )
                 .padding(4)
                 .style(theme::Container::Background),

examples/cosmic/src/window/editor.rs

@@ -1,7 +1,6 @@
 use apply::Apply;
 use cosmic::iced::widget::{horizontal_space, row, scrollable};
-use cosmic::iced::Length;
-use cosmic::iced_winit::Alignment;
+use cosmic::iced::{Alignment, Length};
 use cosmic::widget::{button, segmented_button, view_switcher};
 use cosmic::{theme, Element};
 use slotmap::Key;