From a8a5dbadf45cfc4be26bdc63845defa185768436 Mon Sep 17 00:00:00 2001 From: git-f0x <150025636+git-f0x@users.noreply.github.com> Date: Sat, 3 Aug 2024 00:11:14 +0200 Subject: [PATCH] chore: fmt --- cosmic-settings/src/app.rs | 12 ++++++------ cosmic-settings/src/main.rs | 8 ++++---- cosmic-settings/src/pages/mod.rs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs index 8c8041f..1d37a44 100644 --- a/cosmic-settings/src/app.rs +++ b/cosmic-settings/src/app.rs @@ -61,13 +61,13 @@ impl SettingsApp { PageCommands::Appearance => self.pages.page_id::(), PageCommands::Bluetooth => None, PageCommands::DateTime => self.pages.page_id::(), - PageCommands::Panel => self.pages.page_id::(), - PageCommands::Dock => self.pages.page_id::(), PageCommands::Displays => self.pages.page_id::(), + PageCommands::Dock => self.pages.page_id::(), PageCommands::Firmware => self.pages.page_id::(), PageCommands::Keyboard => self.pages.page_id::(), PageCommands::Mouse => self.pages.page_id::(), PageCommands::Network => None, + PageCommands::Panel => self.pages.page_id::(), PageCommands::Power => self.pages.page_id::(), PageCommands::RegionLanguage => self.pages.page_id::(), PageCommands::Sound => self.pages.page_id::(), @@ -321,10 +321,6 @@ impl cosmic::Application for SettingsApp { } } - crate::pages::Message::WindowManagement(message) => { - page::update!(self.pages, message, desktop::window_management::Page); - } - crate::pages::Message::DesktopWorkspaces(message) => { page::update!(self.pages, message, desktop::workspaces::Page); } @@ -444,6 +440,10 @@ impl cosmic::Application for SettingsApp { crate::pages::Message::Power(message) => { page::update!(self.pages, message, power::Page); } + + crate::pages::Message::WindowManagement(message) => { + page::update!(self.pages, message, desktop::window_management::Page); + } }, Message::OutputAdded(info, output) => { diff --git a/cosmic-settings/src/main.rs b/cosmic-settings/src/main.rs index 8a1e5d3..e6e734c 100644 --- a/cosmic-settings/src/main.rs +++ b/cosmic-settings/src/main.rs @@ -46,12 +46,10 @@ pub enum PageCommands { Bluetooth, /// DateTime settings page DateTime, - /// Panel settings page - Panel, - /// Dock settings page - Dock, /// Displays settings page Displays, + /// Dock settings page + Dock, /// Firmware settings page Firmware, /// Keyboard settings page @@ -60,6 +58,8 @@ pub enum PageCommands { Mouse, /// Network settings page Network, + /// Panel settings page + Panel, /// Power settings page Power, /// Region & Language settings page diff --git a/cosmic-settings/src/pages/mod.rs b/cosmic-settings/src/pages/mod.rs index 8ad3170..22ca262 100644 --- a/cosmic-settings/src/pages/mod.rs +++ b/cosmic-settings/src/pages/mod.rs @@ -20,7 +20,6 @@ pub enum Message { DateAndTime(time::date::Message), Desktop(desktop::Message), DesktopWallpaper(desktop::wallpaper::Message), - WindowManagement(desktop::window_management::Message), DesktopWorkspaces(desktop::workspaces::Message), Displays(display::Message), Dock(desktop::dock::Message), @@ -38,6 +37,7 @@ pub enum Message { Power(power::Message), SystemShortcuts(input::keyboard::shortcuts::ShortcutMessage), TilingShortcuts(input::keyboard::shortcuts::ShortcutMessage), + WindowManagement(desktop::window_management::Message), } impl From for crate::Message {