run cargo fmt

MartinAskestad · Jul 22, 2023 · 77a4f4a · 77a4f4a
1 parent a95bfc7
commit 77a4f4a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/src/appwindow.rs b/src/appwindow.rs
@@ -26,7 +26,7 @@ use windows::{
     },
 };
 
-use grout_wm::{Result, HIWORD, LOWORD, to_wide_arr};
+use grout_wm::{to_wide_arr, Result, HIWORD, LOWORD};
 
 use crate::{
     win32::{
@@ -142,10 +142,26 @@ impl AppWindow {
         let dw_mask = windows::Win32::UI::Shell::THB_ICON
             | windows::Win32::UI::Shell::THB_TOOLTIP
             | windows::Win32::UI::Shell::THB_FLAGS;
-        let dwindle_icon = if is_light_theme { w!("dwindle-blk") } else { w!("dwindle-wht") };
-        let monocle_icon = if is_light_theme { w!("monocle-blk") } else { w!("monocle-wht") };
-        let columns_icon = if is_light_theme { w!("columns-blk") } else { w!("columns-wht") };
-        let focus_icon = if is_light_theme { w!("focus-blk") } else { w!("focus-wht") };
+        let dwindle_icon = if is_light_theme {
+            w!("dwindle-blk")
+        } else {
+            w!("dwindle-wht")
+        };
+        let monocle_icon = if is_light_theme {
+            w!("monocle-blk")
+        } else {
+            w!("monocle-wht")
+        };
+        let columns_icon = if is_light_theme {
+            w!("columns-blk")
+        } else {
+            w!("columns-wht")
+        };
+        let focus_icon = if is_light_theme {
+            w!("focus-blk")
+        } else {
+            w!("focus-wht")
+        };
         let buttons: Vec<windows::Win32::UI::Shell::THUMBBUTTON> = vec![
             windows::Win32::UI::Shell::THUMBBUTTON {
                 dwMask: dw_mask,

diff --git a/src/lib.rs b/src/lib.rs
@@ -31,12 +31,12 @@ macro_rules! to_wide_arr {
     ($input:expr) => {{
         let mut result: [u16; 260] = [0; 260];
         let chars = $input.chars().take(260);
-        for(i, ch) in chars.enumerate() {
+        for (i, ch) in chars.enumerate() {
             result[i] = ch as u16;
         }
         result
     }};
-        }
+}
 
 pub struct Error {
     pub(crate) message: String,

diff --git a/src/win32/theme.rs b/src/win32/theme.rs
@@ -21,10 +21,8 @@ pub fn is_light_theme() -> bool {
             Some(&mut size),
         )
     };
-    if res != ERROR_SUCCESS {
-        if res == ERROR_FILE_NOT_FOUND {
-            return true;
-        }
+    if res != ERROR_SUCCESS && res == ERROR_FILE_NOT_FOUND {
+        return true;
     }
     i32::from_le_bytes(buffer) == 1
 }