From 26ab69c7ab33aa05ea798be2ce8cd41617910736 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Thu, 11 Jul 2024 08:38:21 +0200 Subject: [PATCH] improv: enable sliders to scale with single column view Closes #374 --- cosmic-settings/src/pages/input/keyboard/mod.rs | 12 ++++++++---- cosmic-settings/src/pages/input/mouse.rs | 14 +++++++++----- cosmic-settings/src/pages/input/touchpad.rs | 14 +++++++++----- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/cosmic-settings/src/pages/input/keyboard/mod.rs b/cosmic-settings/src/pages/input/keyboard/mod.rs index 31db20e..7c53129 100644 --- a/cosmic-settings/src/pages/input/keyboard/mod.rs +++ b/cosmic-settings/src/pages/input/keyboard/mod.rs @@ -675,9 +675,11 @@ fn keyboard_typing_assist() -> Section { page.xkb.repeat_delay, Message::SetRepeatKeysDelay, ) - .width(250.0) + .width(Length::Fill) .breakpoints(&[KB_REPEAT_DELAY_DEFAULT]) - .step(50_u32); + .step(50_u32) + .apply(widget::container) + .max_width(250); row::with_capacity(3) .align_items(iced::Alignment::Center) @@ -693,9 +695,11 @@ fn keyboard_typing_assist() -> Section { page.xkb.repeat_rate, Message::SetRepeatKeysRate, ) - .width(250.0) + .width(Length::Fill) .breakpoints(&[KB_REPEAT_RATE_DEFAULT]) - .step(5_u32); + .step(5_u32) + .apply(widget::container) + .max_width(250); row::with_capacity(3) .align_items(iced::Alignment::Center) diff --git a/cosmic-settings/src/pages/input/mouse.rs b/cosmic-settings/src/pages/input/mouse.rs index afa386c..869b57e 100644 --- a/cosmic-settings/src/pages/input/mouse.rs +++ b/cosmic-settings/src/pages/input/mouse.rs @@ -1,4 +1,4 @@ -use cosmic::iced::Alignment; +use cosmic::iced::{Alignment, Length}; use cosmic::widget::{self, row, settings, text}; use cosmic::{Apply, Element}; use cosmic_comp_config::input::AccelProfile; @@ -73,8 +73,10 @@ fn mouse() -> Section { let slider = widget::slider(0.0..=100.0, value, |value| { Message::SetMouseSpeed((value / 70.71) - 0.81, false) }) - .width(250.0) - .breakpoints(&[50.0]); + .width(Length::Fill) + .breakpoints(&[50.0]) + .apply(widget::container) + .max_width(250); row::with_capacity(2) .align_items(Alignment::Center) @@ -130,8 +132,10 @@ fn scrolling() -> Section { let slider = widget::slider(1.0..=100.0, value, |value| { Message::SetScrollFactor(2f64.powf((value - 50.0) / 10.0), false) }) - .width(250.0) - .breakpoints(&[50.0]); + .width(Length::Fill) + .breakpoints(&[50.0]) + .apply(widget::container) + .max_width(250); row::with_capacity(2) .align_items(Alignment::Center) diff --git a/cosmic-settings/src/pages/input/touchpad.rs b/cosmic-settings/src/pages/input/touchpad.rs index c29afb4..c0c6490 100644 --- a/cosmic-settings/src/pages/input/touchpad.rs +++ b/cosmic-settings/src/pages/input/touchpad.rs @@ -1,4 +1,4 @@ -use cosmic::iced::Alignment; +use cosmic::iced::{Alignment, Length}; use cosmic::widget::{self, row, settings, text}; use cosmic::{Apply, Element}; use cosmic_comp_config::input::{AccelProfile, ClickMethod, ScrollMethod}; @@ -70,8 +70,10 @@ fn touchpad() -> Section { let slider = widget::slider(1.0..=100.0, value, |value| { Message::SetMouseSpeed((value / 70.71) - 0.81, true) }) - .width(250.0) - .breakpoints(&[50.0]); + .width(Length::Fill) + .breakpoints(&[50.0]) + .apply(widget::container) + .max_width(250); row::with_capacity(2) .align_items(Alignment::Center) @@ -208,8 +210,10 @@ fn scrolling() -> Section { let slider = widget::slider(1.0..=100.0, value, |value| { Message::SetScrollFactor(2f64.powf((value - 50.0) / 10.0), true) }) - .width(250.0) - .breakpoints(&[50.0]); + .width(Length::Fill) + .breakpoints(&[50.0]) + .apply(widget::container) + .max_width(250); row::with_capacity(2) .align_items(Alignment::Center)