improv: Use gtk::Settings to set dark mode

This seems a little cleaner than using an env var here, and it doesn't
hard code a particular theme name.

Author: ids1024

src/application/mod.rs

@@ -118,7 +118,9 @@ fn with_daemon<F: Fn(Rc<dyn Daemon>)>(f: F) {
 
 #[cfg(target_os = "macos")]
 fn macos_init() {
+    use gtk::SettingsExt;
     use std::{env, process};
+    let mut prefer_dark = false;
     // This command returns Dark if we should use the dark theme
     // defaults read -g AppleInterfaceStyle
     if let Ok(output) = process::Command::new("defaults")
@@ -127,40 +129,45 @@ fn macos_init() {
         .arg("AppleInterfaceStyle")
         .output()
     {
-        if output.stdout.starts_with(b"Dark") {
-            let _ = env::set_var("GTK_THEME", "Adwaita:dark");
-        }
+        prefer_dark = output.stdout.starts_with(b"Dark");
+    }
+
+    if let Some(settings) = gtk::Settings::get_default() {
+        settings.set_property_gtk_application_prefer_dark_theme(prefer_dark);
     }
 }
 
 #[cfg(target_os = "windows")]
 fn windows_init() {
-    use std::env;
     // This is a dword with a value of 0 if we should use the dark theme:
     // HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize\AppsUseLightTheme
+    use gtk::SettingsExt;
     use winreg::RegKey;
+    let mut prefer_dark = false;
     let hkcu = RegKey::predef(winreg::enums::HKEY_CURRENT_USER);
     if let Ok(subkey) = hkcu.open_subkey("Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize") {
         if let Ok(dword) = subkey.get_value::<u32, _>("AppsUseLightTheme") {
-            if dword == 0 {
-                let _ = env::set_var("GTK_THEME", "Adwaita:dark");
-            }
+            prefer_dark = (dword == 0);
         }
     }
+
+    if let Some(settings) = gtk::Settings::get_default() {
+        settings.set_property_gtk_application_prefer_dark_theme(prefer_dark);
+    }
 }
 
 pub fn run(args: Vec<String>) -> i32 {
-    #[cfg(target_os = "macos")]
-    macos_init();
-
-    #[cfg(target_os = "windows")]
-    windows_init();
-
     let application =
         gtk::Application::new(Some("com.system76.keyboard-layout"), Default::default())
             .expect("Failed to create gtk::Application");
 
     application.connect_activate(move |app| {
+        #[cfg(target_os = "macos")]
+        macos_init();
+
+        #[cfg(target_os = "windows")]
+        windows_init();
+
         if let Some(window) = app.get_active_window() {
             //TODO
             eprintln!("Focusing current window");