Popped scratchpad windows should show a border

avahe-kellenberger · Sep 2, 2024 · 9bcf4e3 · 9bcf4e3
1 parent 6928df5
commit 9bcf4e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/nimdowpkg/config/configloader.nim b/src/nimdowpkg/config/configloader.nim
@@ -409,7 +409,7 @@ proc populateBarSettings*(this: Config, barSettings: var BarSettings, settingsTa
       barSettings.transparency = clamp(barTransparency.intVal, 0, 255).uint8
 
   let hasWindowsColor= this.loadHexValue(settingsTable, "barHasWindowsColor")
-  if hasWindowsColor!= -1:
+  if hasWindowsColor != -1:
     barSettings.hasWindowsColor= hasWindowsColor
   else:
     barSettings.hasWindowsColor = fgColor

diff --git a/src/nimdowpkg/windowmanager.nim b/src/nimdowpkg/windowmanager.nim
@@ -638,6 +638,14 @@ proc popScratchpad(this: WindowManager) =
 
     client.isFloating = true
     this.moveClientToMonitor(client, selectedMonitorIndex)
+
+    client.borderWidth = this.windowSettings.borderWidth
+    client.adjustToState(this.display)
+    discard XSetWindowBorder(
+      this.display,
+      client.window,
+      this.windowSettings.borderColorFocused
+    )
   else:
     # Floating/fullscreen/etc
     client.x = this.selectedMonitor.area.x +
@@ -777,7 +785,6 @@ proc focus*(this: WindowManager, client: Client, warpToClient: bool) =
       if taggedClient != client:
         this.unfocus(taggedClient)
 
-  this.selectedMonitor.setSelectedClient(client)
   this.selectedMonitor.focusClient(client, warpToClient)
   this.grabButtons(client, true)
   if client.isFloating: