From 23ec5657130c48aaa97dc1f0376259db14137e3b Mon Sep 17 00:00:00 2001
From: Kievits Rene <crylia@yohra.speedport.ip>
Date: Wed, 20 Apr 2022 08:03:49 +0200
Subject: [PATCH] fix window corners (now drawn by awesome, not picom) and
 wrong center bar radius

---
 awesome/crylia_bar/center_bar.lua | 2 +-
 awesome/crylia_bar/dock.lua       | 9 +++++++--
 awesome/rc.lua                    | 2 +-
 awesome/src/core/signals.lua      | 4 ++++
 picom.conf                        | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/awesome/crylia_bar/center_bar.lua b/awesome/crylia_bar/center_bar.lua
index 967832c..91c902d 100644
--- a/awesome/crylia_bar/center_bar.lua
+++ b/awesome/crylia_bar/center_bar.lua
@@ -19,7 +19,7 @@ return function(s, widget)
         maximum_width = dpi(500),
         placement = function(c) awful.placement.top(c, { margins = dpi(10) }) end,
         shape = function(cr, width, height)
-            gears.shape.rounded_rect(cr, width, height, 10)
+            gears.shape.rounded_rect(cr, width, height, 5)
         end
     }
 
diff --git a/awesome/crylia_bar/dock.lua b/awesome/crylia_bar/dock.lua
index 80a4619..87091c9 100644
--- a/awesome/crylia_bar/dock.lua
+++ b/awesome/crylia_bar/dock.lua
@@ -120,6 +120,7 @@ return function(screen, programs)
                 bg = '00000000',
                 forced_width = user_vars.dock_icon_size + dpi(20),
                 forced_height = dpi(10),
+                id = "fake",
                 widget = wibox.container.background
             }
         end
@@ -186,16 +187,20 @@ return function(screen, programs)
         end
         if s == mouse.screen then
             if mouse.current_widget then
-                dock.visible = true
-                return
+                if tostring(mouse.current_widget):match("fake") then
+                    dock.visible = true
+                    return
+                end
             end
             for j, c in ipairs(screen.selected_tag:clients()) do
                 local y = c:geometry().y
                 local h = c.height
                 if (y + h) >= screen.geometry.height - user_vars.dock_icon_size - 35 then
                     dock.visible = false
+                    return
                 else
                     dock.visible = true
+                    return
                 end
             end
         else
diff --git a/awesome/rc.lua b/awesome/rc.lua
index 686fa04..36f77c0 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -15,4 +15,4 @@ require("src.core.signals")
 require("mappings.global_buttons")
 require("mappings.bind_to_tags")
 require("crylia_bar.init")
---require("src.tools.auto_starter")(user_vars.autostart)
+require("src.tools.auto_starter")(user_vars.autostart)
diff --git a/awesome/src/core/signals.lua b/awesome/src/core/signals.lua
index 7bf0d70..b0b0ab0 100644
--- a/awesome/src/core/signals.lua
+++ b/awesome/src/core/signals.lua
@@ -1,6 +1,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local beautiful = require("beautiful")
+local gears = require("gears")
 
 screen.connect_signal(
     "added",
@@ -22,6 +23,9 @@ client.connect_signal(
         if awesome.startup and not c.size_hints.user_porition and not c.size_hints.program_position then
             awful.placement.no_offscreen(c)
         end
+        c.shape = function(cr, width, height)
+            gears.shape.rounded_rect(cr, width, height, 10)
+        end
     end
 )
 
diff --git a/picom.conf b/picom.conf
index 0802dbb..b9ae9c4 100644
--- a/picom.conf
+++ b/picom.conf
@@ -102,7 +102,7 @@ blur-background-exclude = [
 # ░█░█░█▀▀░█░█░█▀▀░█▀▄░█▀█░█░░░░░▀▀█░█▀▀░░█░░░█░░░█░░█░█░█░█░▀▀█
 # ░▀▀▀░▀▀▀░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░░▀░░▀▀▀░▀░▀░▀▀▀░▀▀▀
 
-corner-radius = 10.0
+#corner-radius = 10.0
 rounded-corners-exclude = [
 	"name 	*= 'Awesome drawin'",
 	"name	*= 'polybar'",