开启全屏时总是隐藏bar 关闭全屏时总是显示bar

2han9wen71an · Oct 9, 2023 · 46c5aa7 · 46c5aa7
1 parent 43872d6
commit 46c5aa7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/DEF/statusbar/packages/wifi.sh b/DEF/statusbar/packages/wifi.sh
@@ -26,7 +26,7 @@ update() {
     [ "$wifi_text" = "" ] && wifi_text=$wifi_disconnected
 
     icon=" $wifi_icon "
-    text=" $wifi_text "
+    text="$wifi_text "
 
     sed -i '/^export '$this'=.*$/d' $tempfile
     printf "export %s='%s%s%s%s%s'\n" $this "$signal" "$icon_color" "$icon" "$text_color" "$text" >> $tempfile

diff --git a/dwm.c b/dwm.c
@@ -2439,13 +2439,19 @@ setfullscreen(Client *c, int fullscreen)
 void
 fullscreen(const Arg *arg)
 {
-    if (selmon->sel) {
+    if (!selmon->sel) {
+        togglebar(arg);
+        return;
+    }
+    if (selmon->sel->isfullscreen) {
+        setfullscreen(selmon->sel, 0);
+        if (!selmon->showbar)
+            togglebar(arg);
+    } else {
+        setfullscreen(selmon->sel, 1);
         if (selmon->showbar)
-            setfullscreen(selmon->sel, 1);
-        else
-            setfullscreen(selmon->sel, 0);
+            togglebar(arg);
     }
-    togglebar(arg);
 }
 
 void