various fixes

pop-os · Feb 1, 2024 · d195ded · d195ded
1 parent 63ad529
commit d195ded
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 105 deletions.
diff --git a/examples/cosmic/Cargo.toml b/examples/cosmic/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 apply = "0.3.0"
 fraction = "0.14.0"
-libcosmic = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "dbus-config", "wgpu"] }
+libcosmic = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "dbus-config", ] }
 once_cell = "1.18"
 slotmap = "1.0.6"
 env_logger = "0.10"
@@ -17,5 +17,5 @@ log = "0.4.17"
 [dependencies.cosmic-time]
 git = "https://github.com/pop-os/cosmic-time"
 default-features = false
-branch = "update-0.12"
+branch = "wip-iced-update"
 features = ["libcosmic", "once_cell"]
diff --git a/examples/cosmic/src/main.rs b/examples/cosmic/src/main.rs
@@ -14,7 +14,14 @@ pub fn main() -> cosmic::iced::Result {
 
     env_logger::init_from_env(env);
     cosmic::icon_theme::set_default("Pop");
-    let mut settings = Settings::default();
-    settings.window.min_size = Some(cosmic::iced::Size::new(600., 300.));
+    #[allow(clippy::field_reassign_with_default)]
+    let settings = Settings {
+        default_font: cosmic::font::FONT,
+        window: cosmic::iced::window::Settings {
+            min_size: Some(cosmic::iced::Size::new(600., 300.)),
+            ..cosmic::iced::window::Settings::default()
+        },
+        ..Settings::default()
+    };
     Window::run(settings)
 }
diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs
@@ -288,6 +288,7 @@ impl Window {
             )
             .padding([20, 24]),
         )
+        .width(Length::Fill)
         .padding(0)
         .style(theme::iced::Button::Transparent)
         .on_press(Message::from(sub_page.into_page()))
@@ -565,11 +566,11 @@ impl Application for Window {
             };
 
             widgets.push(
-                scrollable(row![
-                    horizontal_space(Length::Fill),
-                    content.debug(self.debug),
-                    horizontal_space(Length::Fill),
-                ])
+                scrollable(
+                    container(content.debug(self.debug))
+                        .align_x(iced::alignment::Horizontal::Center),
+                )
+                .width(Length::Fill)
                 .into(),
             );
         }

diff --git a/examples/cosmic/src/window/demo.rs b/examples/cosmic/src/window/demo.rs
@@ -3,7 +3,7 @@ use std::{cell::RefCell, rc::Rc};
 use apply::Apply;
 use cosmic::{
     cosmic_theme,
-    iced::widget::{checkbox, column, progress_bar, radio, slider, text, text_input},
+    iced::widget::{checkbox, column, progress_bar, radio, slider, text},
     iced::{Alignment, Length},
     iced_core::id,
     theme::ThemeType,
@@ -488,6 +488,7 @@ impl State {
             .into(),
             cosmic::widget::text_input("", &self.entry_value)
                 .label("Test Input")
+                .helper_text("test helper text")
                 .on_input(Message::InputChanged)
                 .size(20)
                 .id(INPUT_ID.clone())

diff --git a/examples/cosmic/src/window/desktop.rs b/examples/cosmic/src/window/desktop.rs
@@ -135,6 +135,7 @@ impl State {
                 .spacing(16)
                 .into(),
             ])
+            .width(Length::Fill)
             .into(),
             Some(DesktopPage::DesktopOptions) => self.view_desktop_options(window),
             Some(DesktopPage::Wallpaper) => self.view_desktop_wallpaper(window),

diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs
@@ -756,7 +756,7 @@ where
                             height: bounds.height,
                         },
                         border: Border {
-                            radius: appearance.focus.first.border_radius,
+                            radius: theme.cosmic().radius_s().into(),
                             ..Default::default()
                         },
                         shadow: Shadow::default(),
@@ -808,7 +808,7 @@ where
                             height: bounds.height,
                         },
                         border: Border {
-                            radius: appearance.focus.last.border_radius,
+                            radius: theme.cosmic().radius_s().into(),
                             ..Default::default()
                         },
                         shadow: Shadow::default(),