From 77b8718706f1034b7620912a2c03888616e9793c Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 7 Dec 2023 17:32:29 -0500 Subject: [PATCH] fix: headerbar and multi-window example improvements --- examples/multi-window/src/window.rs | 23 ++++++++--------------- src/app/settings.rs | 2 +- src/theme/style/iced.rs | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/examples/multi-window/src/window.rs b/examples/multi-window/src/window.rs index 54052a15..e08f0762 100644 --- a/examples/multi-window/src/window.rs +++ b/examples/multi-window/src/window.rs @@ -1,11 +1,11 @@ use std::collections::HashMap; use cosmic::{ - app::Core, + app::{command::message::cosmic, Core}, iced::{self, event, window}, iced_core::{id, Alignment, Length, Point}, iced_widget::{column, scrollable, text, text_input}, - widget::{button, container}, + widget::{button, container, cosmic_container}, Command, }; @@ -132,14 +132,13 @@ impl cosmic::Application for MultiWindow { let new_window_button = button(text("New Window")).on_press(Message::NewWindow); - let content = scrollable( - column![input, new_window_button] - .spacing(50) - .width(Length::Fill) - .align_items(Alignment::Center), - ); + let content = column![input, new_window_button] + .spacing(50) + .width(Length::Fill) + .align_items(Alignment::Center); - container(container(content).width(200).center_x()) + cosmic_container::container(container(content).width(200).center_x()) + .style(cosmic::style::Container::Background) .width(Length::Fill) .height(Length::Fill) .center_x() @@ -147,12 +146,6 @@ impl cosmic::Application for MultiWindow { .into() } - fn style( - &self, - ) -> Option<::Style> { - Some(Default::default()) - } - fn view(&self) -> cosmic::prelude::Element { self.view_window(window::Id::MAIN) } diff --git a/src/app/settings.rs b/src/app/settings.rs index c54b52d4..0606216d 100644 --- a/src/app/settings.rs +++ b/src/app/settings.rs @@ -95,7 +95,7 @@ impl Default for Settings { #[cfg(feature = "wayland")] size_limits: Limits::NONE.min_height(1.0).min_width(1.0), theme: crate::theme::system_preference(), - transparent: false, + transparent: true, exit_on_close: true, } } diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs index ba58c136..a6c306fd 100644 --- a/src/theme/style/iced.rs +++ b/src/theme/style/iced.rs @@ -392,7 +392,7 @@ impl container::StyleSheet for Theme { icon_color: Some(Color::from(palette.accent.base)), text_color: Some(Color::from(palette.background.on)), background: Some(iced::Background::Gradient(iced_core::Gradient::Linear( - Linear::new(Radians(3.0 * PI / 2.0)) + Linear::new(Radians(PI)) .add_stop(0.0, header_top.into()) .add_stop(1.0, header_bottom.into()), ))),