From 02413e5fa6e1ab5a73c4cd09f98f804e798c5387 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Wed, 13 Sep 2023 15:24:18 +0200
Subject: [PATCH] chore(app): remove redundant system theme property

The system theme is now set globally, so this is no longer used.
---
 src/app/core.rs   |  4 ----
 src/app/cosmic.rs | 23 ++---------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/app/core.rs b/src/app/core.rs
index d5a979a3..8fa41639 100644
--- a/src/app/core.rs
+++ b/src/app/core.rs
@@ -1,8 +1,6 @@
 // Copyright 2023 System76 <info@system76.com>
 // SPDX-License-Identifier: MPL-2.0
 
-use crate::{theme, Theme};
-
 /// Status of the nav bar and its panels.
 #[derive(Clone)]
 pub struct NavBar {
@@ -41,7 +39,6 @@ pub struct Core {
     /// Scaling factor used by the application
     scale_factor: f32,
 
-    pub system_theme: Theme,
     pub(crate) title: String,
     pub window: Window,
     #[cfg(feature = "applet")]
@@ -59,7 +56,6 @@ impl Default for Core {
                 toggled_condensed: true,
             },
             scale_factor: 1.0,
-            system_theme: theme::theme(),
             title: String::new(),
             window: Window {
                 use_template: true,
diff --git a/src/app/cosmic.rs b/src/app/cosmic.rs
index 74d15f08..512bba8e 100644
--- a/src/app/cosmic.rs
+++ b/src/app/cosmic.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use super::{command, Application, ApplicationExt, Core, Subscription};
-use crate::theme::{self, Theme, ThemeType, THEME};
+use crate::theme::{self, Theme, THEME};
 use crate::widget::nav_bar;
 use crate::{keyboard_nav, Element};
 #[cfg(feature = "wayland")]
@@ -36,8 +36,6 @@ pub enum Message {
     ScaleFactor(f32),
     /// Requests theme changes.
     ThemeChange(Theme),
-    /// Notification of system theme changes.
-    SystemThemeChange(Theme),
     /// Toggles visibility of the nav bar.
     ToggleNavBar,
     /// Toggles the condensed status of the nav bar.
@@ -151,7 +149,7 @@ where
                 .map(Message::KeyboardNav)
                 .map(super::Message::Cosmic),
             theme::subscription(0)
-                .map(Message::SystemThemeChange)
+                .map(Message::ThemeChange)
                 .map(super::Message::Cosmic),
             window_events.map(super::Message::Cosmic),
         ])
@@ -275,13 +273,6 @@ impl<T: Application> Cosmic<T> {
             }
 
             Message::ThemeChange(theme) => {
-                // our system theme is always receiving updates so we should use it instead
-                let theme = if matches!(theme.theme_type, ThemeType::System(_)) {
-                    self.app.core().system_theme.clone()
-                } else {
-                    theme
-                };
-
                 THEME.with(move |t| {
                     let mut cosmic_theme = t.borrow_mut();
                     cosmic_theme.set_theme(theme.theme_type);
@@ -291,16 +282,6 @@ impl<T: Application> Cosmic<T> {
             Message::ScaleFactor(factor) => {
                 self.app.core_mut().set_scale_factor(factor);
             }
-            Message::SystemThemeChange(theme) => {
-                self.app.core_mut().system_theme = theme.clone();
-                THEME.with(move |t| {
-                    let mut cosmic_theme = t.borrow_mut();
-                    // only apply update if the theme is set to load a system theme
-                    if matches!(cosmic_theme.theme_type, ThemeType::System(_)) {
-                        cosmic_theme.set_theme(theme.theme_type);
-                    }
-                });
-            }
         }
 
         iced::Command::none()