leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: libcosmic rebase with Application API

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-09-19 16:54:50 +02:00 • committed by Michael Murphy
parent d243e45094
commit 454894d82f
18 changed files with 1081 additions and 1198 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/pages/desktop/wallpaper/mod.rs
View file

@ -13,7 +13,7 @@ use apply::Apply;
use cosmic::widget::{
list_column,
segmented_button::{self, SingleSelectModel},
settings, toggler,
segmented_selection, settings, text, toggler,
};
use cosmic::{iced::Length, Element};
use cosmic::{iced_core::alignment, iced_runtime::core::image::Handle as ImageHandle};
@ -591,7 +591,7 @@ pub fn settings() -> Section<crate::pages::Message> {
));
children.push(if page.config.same_on_all {
cosmic::widget::text(fl!("all-displays"))
text(fl!("all-displays"))
.font(cosmic::font::FONT_SEMIBOLD)
.horizontal_alignment(alignment::Horizontal::Center)
.vertical_alignment(alignment::Vertical::Center)
@ -602,7 +602,7 @@ pub fn settings() -> Section<crate::pages::Message> {
.height(Length::Fixed(32.0))
.into()
} else {
cosmic::widget::horizontal_segmented_selection(&page.outputs)
segmented_selection::horizontal(&page.outputs)
.on_activate(Message::Output)
.into()
});
@ -669,7 +669,6 @@ pub fn settings() -> Section<crate::pages::Message> {
cosmic::iced::widget::column(children)
.spacing(22)
.max_width(683)
.apply(Element::from)
.map(crate::pages::Message::DesktopWallpaper)
})

16
app/src/pages/desktop/wallpaper/widgets.rs
View file

@ -2,10 +2,11 @@
// SPDX-License-Identifier: GPL-3.0-only
use super::Message;
use apply::Apply;
use cosmic::iced_core::{self, gradient::Linear, Background, BorderRadius, Color, Degrees};
use cosmic::iced_core::{alignment, Length};
use cosmic::iced_runtime::core::image::Handle as ImageHandle;
use cosmic::prelude::*;
use cosmic::widget::{button, container, image, space};
use cosmic::{iced, Element};
use cosmic_settings_desktop::wallpaper;
use slotmap::DefaultKey;
@ -18,9 +19,9 @@ const ROW_SPACING: u16 = 16;
/// A button for selecting a color or gradient.
pub fn color_button(color: wallpaper::Color) -> Element<'static, Message> {
iced::widget::button(color_image(color.clone(), COLOR_WIDTH, COLOR_WIDTH, 8.0))
button(color_image(color.clone(), COLOR_WIDTH, COLOR_WIDTH, 8.0))
.padding(0)
.style(cosmic::theme::Button::Transparent)
.style(button::Style::IconVertical)
.on_press(Message::ColorSelect(color))
.into()
}
@ -32,9 +33,10 @@ pub fn color_image(
height: u16,
border_radius: f32,
) -> Element<'static, Message> {
iced::widget::container(iced::widget::space::Space::new(width, height))
container(space::Space::new(width, height))
.style(cosmic::theme::Container::custom(move |_theme| {
iced::widget::container::Appearance {
container::Appearance {
icon_color: None,
text_color: None,
background: Some(match &color {
wallpaper::Color::Single([r, g, b]) => {
@ -98,9 +100,9 @@ fn flex_select_row<'a>(
}
fn wallpaper_button(handle: &ImageHandle, id: DefaultKey) -> Element<Message> {
let image = iced::widget::image(handle.clone()).apply(iced::Element::from);
let image = image(handle.clone()).apply(iced::Element::from);
iced::widget::button(image)
button(image)
.padding(0)
.style(cosmic::theme::Button::Transparent)
.on_press(Message::Select(id))