1 files changed, 10 insertions, 46 deletions
diff --git a/quickshell/shell.qml b/quickshell/shell.qml
index 3ed0161..2396ea8 100644
--- a/quickshell/shell.qml
+++ b/quickshell/shell.qml
@@ -25,23 +25,24 @@ ShellRoot {
   property int fontSize: 18
 
   property bool appLauncherVisible: false
+  property bool barVisible: true
   property bool calendarVisible: false
   property bool dnd: false
   property bool batteryInfo: false
   property bool blink: false
 
   GlobalShortcut {
-    id: launcherShortcut
-    name: "toggleLauncher"
+    id: barShortcut
+    name: "toggleBar"
     onPressed: {
-      appLauncherVisible = true
+      barVisible = !barVisible
     }
   }
   GlobalShortcut {
-    id: calendarShortcut
-    name: "toggleCalendar"
+    id: launcherShortcut
+    name: "toggleLauncher"
     onPressed: {
-      calendarVisible = true
+      appLauncherVisible = !appLauncherVisible
     }
   }
   GlobalShortcut {
@@ -56,6 +57,8 @@ ShellRoot {
     model: Quickshell.screens
     PanelWindow {
       id: root
+      // don't render this if shell.navVisible is false
+      visible: shellRoot.barVisible
 
       property int cpuUsage: 0
       property int lastCpuTotal: 0
@@ -95,6 +98,7 @@ ShellRoot {
         anchors.leftMargin: 10
         anchors.rightMargin: 10
 
+
         Workspace {}
         Item { Layout.fillWidth: true }
         Radio {}
@@ -153,46 +157,6 @@ ShellRoot {
     model: Quickshell.screens
     
     PanelWindow {
-      visible: shellRoot.calendarVisible
-      
-      anchors {
-        top: true
-        left: true
-      }
-      
-      margins {
-        top: 5
-        left: Screen.width - 435 - 5
-      }
-      
-      implicitWidth: 435
-      implicitHeight: 370
-      
-      color: "transparent"
-      exclusiveZone: 0
-      
-      WlrLayershell.layer: WlrLayer.Overlay
-      WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
-      
-      Behavior on height {
-        NumberAnimation { duration: 200; easing.type: Easing.OutCubic }
-      }
-      
-      Calendar {
-        anchors.fill: parent
-        isVisible: shellRoot.calendarVisible
-        
-        onRequestClose: {
-          shellRoot.calendarVisible = false
-        }
-      }
-    }
-  }
-
-  Variants {
-    model: Quickshell.screens
-    
-    PanelWindow {
       visible: shellRoot.batteryInfo
       
       anchors {