add hide_tray_icon option. closes #7

keifufu · Jun 12, 2024 · 0e61c9b · 0e61c9b
1 parent ab776f9
commit 0e61c9b
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 62 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -34,6 +34,7 @@ pub struct WindowRule {
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Config {
   pub run_at_startup: bool,
+  pub hide_tray_icon: Option<bool>, // option because i cant be bothered handling config upgrades
   pub window_rules: Vec<WindowRule>,
 }
 

diff --git a/src/data/config.yaml b/src/data/config.yaml
@@ -1,4 +1,5 @@
 run_at_startup: false
+hide_tray_icon: false
 window_rules:
   - match: "Global"
     active_border_color: "#c6a0f6"

diff --git a/src/main.rs b/src/main.rs
@@ -1,4 +1,5 @@
 #![windows_subsystem = "windows"]
+#![allow(unused_assignments)]
 
 use config::Config;
 use config::RuleMatch;
@@ -66,69 +67,72 @@ fn main() {
       std::process::exit(1);
     }
 
-    let tray_menu_builder = Menu::with_items(&[
-      &MenuItemBuilder::new()
-        .text("Open config")
-        .enabled(true)
-        .id(MenuId::new("0"))
-        .build(),
-      &MenuItemBuilder::new()
-        .text("Reload config")
-        .enabled(true)
-        .id(MenuId::new("1"))
-        .build(),
-      &MenuItemBuilder::new()
-        .text("Exit")
-        .enabled(true)
-        .id(MenuId::new("2"))
-        .build(),
-    ]);
-
-    let tray_menu = match tray_menu_builder {
-      Ok(tray_menu) => tray_menu,
-      Err(err) => {
-        Logger::log("[ERROR] Failed to build tray icon");
-        Logger::log(&format!("[DEBUG] {:?}", err));
-        std::process::exit(1);
-      }
-    };
-
-    let icon = match Icon::from_resource(1, Some((64, 64))) {
-      Ok(icon) => icon,
-      Err(err) => {
-        Logger::log("[ERROR] Failed to create icon");
-        Logger::log(&format!("[DEBUG] {:?}", err));
-        std::process::exit(1);
-      }
-    };
-
-    let tray_icon_builder = TrayIconBuilder::new()
-      .with_menu(Box::new(tray_menu))
-      .with_menu_on_left_click(true)
-      .with_icon(icon)
-      .with_tooltip(format!("cute-borders v{}", env!("CARGO_PKG_VERSION")));
-
     #[allow(unused_variables)]
-    let tray_icon = match tray_icon_builder.build() {
-      Ok(tray_icon) => tray_icon,
-      Err(err) => {
-        Logger::log("[ERROR] Failed to build tray icon");
-        Logger::log(&format!("[DEBUG] {:?}", err));
-        std::process::exit(1);
-      }
-    };
-
-    MenuEvent::set_event_handler(Some(|event: MenuEvent| {
-      if event.id == MenuId::new("0") {
-        let _ = open::that(get_file_path("config.yaml"));
-      } else if event.id == MenuId::new("1") {
-        Config::reload();
-        apply_colors(false);
-      } else if event.id == MenuId::new("2") {
-        apply_colors(true);
-        std::process::exit(0);
-      }
-    }));
+    let tray_icon; // needs to be in the main scope
+    if !Config::get().hide_tray_icon.unwrap_or(false) {
+      let tray_menu_builder = Menu::with_items(&[
+        &MenuItemBuilder::new()
+          .text("Open config")
+          .enabled(true)
+          .id(MenuId::new("0"))
+          .build(),
+        &MenuItemBuilder::new()
+          .text("Reload config")
+          .enabled(true)
+          .id(MenuId::new("1"))
+          .build(),
+        &MenuItemBuilder::new()
+          .text("Exit")
+          .enabled(true)
+          .id(MenuId::new("2"))
+          .build(),
+      ]);
+
+      let tray_menu = match tray_menu_builder {
+        Ok(tray_menu) => tray_menu,
+        Err(err) => {
+          Logger::log("[ERROR] Failed to build tray icon");
+          Logger::log(&format!("[DEBUG] {:?}", err));
+          std::process::exit(1);
+        }
+      };
+
+      let icon = match Icon::from_resource(1, Some((64, 64))) {
+        Ok(icon) => icon,
+        Err(err) => {
+          Logger::log("[ERROR] Failed to create icon");
+          Logger::log(&format!("[DEBUG] {:?}", err));
+          std::process::exit(1);
+        }
+      };
+
+      let tray_icon_builder = TrayIconBuilder::new()
+        .with_menu(Box::new(tray_menu))
+        .with_menu_on_left_click(true)
+        .with_icon(icon)
+        .with_tooltip(format!("cute-borders v{}", env!("CARGO_PKG_VERSION")));
+
+      tray_icon = match tray_icon_builder.build() {
+        Ok(tray_icon) => tray_icon,
+        Err(err) => {
+          Logger::log("[ERROR] Failed to build tray icon");
+          Logger::log(&format!("[DEBUG] {:?}", err));
+          std::process::exit(1);
+        }
+      };
+
+      MenuEvent::set_event_handler(Some(|event: MenuEvent| {
+        if event.id == MenuId::new("0") {
+          let _ = open::that(get_file_path("config.yaml"));
+        } else if event.id == MenuId::new("1") {
+          Config::reload();
+          apply_colors(false);
+        } else if event.id == MenuId::new("2") {
+          apply_colors(true);
+          std::process::exit(0);
+        }
+      }));
+    }
 
     let mut msg = std::mem::zeroed();
     while GetMessageW(&mut msg, std::ptr::null_mut(), 0, 0) != 0 {