Merge remote-tracking branch 'origin/master' into mac

2 files changed, 4 insertions, 4 deletions

diff --git a/scroll/config b/scroll/config
index 889da2e..c6bb704 100644
--- a/scroll/config
+++ b/scroll/config
@@ -230,7 +230,7 @@ animations {
 
     # Overview
     bindsym --no-repeat $mod+tab scale_workspace overview
-    bindsym --whole-window button8 scale_workspace overview
+    #bindsym --whole-window button8 scale_workspace overview
 
     # Jump
     # jump_labels_color #9e1530FF
diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua
index e581cc1..0afaa97 100644
--- a/scroll/scripts/scratchpad.lua
+++ b/scroll/scripts/scratchpad.lua
@@ -24,18 +24,18 @@ end
 command = command or "kitty"
 
 local function exists(id)
-  local is_in_array = false
+  local is_in_scratchpad = false
   local cons = scroll.scratchpad_get_containers()
   for _, con in ipairs(cons) do
     local views = scroll.container_get_views(con)
     for _, view in ipairs(views) do
       local app_id = scroll.view_get_app_id(view)
       if (app_id == id) then
-        is_in_array = true
+        is_in_scratchpad = true
       end
     end
   end
-  return is_in_array
+  return is_in_scratchpad
 end
 
 local function is_focused(id)