add(CLIENT_SHAPE) slot

init.lua

@@ -123,7 +123,24 @@ local client_titlebar = slot {
     connect = true,
     target = capi.client,
     signal = "request::titlebars",
-    slot = my_slots.build_client_titlebars,
+    slot = my_slots.build_titlebars,
+}
+
+gtimer.delayed_call(function()
+    local nice_config = require "awesome-wm-nice.config"
+    local nice_utils = require "awesome-wm-nice.utils"
+
+    nice_config.init()
+    nice_utils.validate_mb_bindings(nice_config)
+end)
+
+-- luacheck: ignore unused variable client_shape
+local client_shape = slot {
+    id = "CLIENT_SHAPE",
+    connect = true,
+    target = capi.client,
+    signal = "request::manage",
+    slot = my_slots.client_shape,
 }
 
 -- luacheck: ignore unused variable ruled_notification

slots/init.lua

@@ -1,9 +1,4 @@
-local abutton = require "awful.button"
-local atitlebar = require "awful.titlebar"
 local beautiful = require "beautiful"
-local lalign = require "wibox.layout.align"
-local lfixed = require "wibox.layout.fixed"
-local lflex = require "wibox.layout.flex"
 local naughty = require "naughty"
 
 local slots = {}
@@ -78,41 +73,21 @@ function slots.build_desktop_decoration(screen)
     desktop_bar(screen)
 end
 
-function slots.build_client_titlebars(client)
+function slots.build_titlebars(client)
-    -- Mouse buttons bindings for the titlebar
+    local titlebar = require "rc.ui.titlebar"
-    local buttons = {
-        abutton({}, 1, function()
-            client:activate { context = "titlebar", action = "mouse_move" }
-        end),
-        abutton({}, 3, function()
-            client:activate { context = "titlebar", action = "mouse_resize" }
-        end),
-    }
 
-    -- Titlebar UI
+    titlebar(client)
-    atitlebar(client).widget = {
+end
-        { -- Left
+
-            atitlebar.widget.iconwidget(client),
+function slots.client_shape(client)
-            buttons = buttons,
+    local beautiful = require "beautiful"
-            layout = lfixed.horizontal,
+    local nice_shapes = require "awesome-wm-nice.shapes"
-        },
+
-        { -- Middle
+    client.shape = nice_shapes.rounded_rect {
-            { -- Title
+        tl = beautiful.client_corner_radius_top,
-                align = "center",
+        tr = beautiful.client_corner_radius_top,
-                widget = atitlebar.widget.titlewidget(client),
+        bl = beautiful.client_corner_radius_bottom,
-            },
+        br = beautiful.client_corner_radius_bottom,
-            buttons = buttons,
-            layout = lflex.horizontal,
-        },
-        { -- Right
-            atitlebar.widget.floatingbutton(client),
-            atitlebar.widget.maximizedbutton(client),
-            atitlebar.widget.stickybutton(client),
-            atitlebar.widget.ontopbutton(client),
-            atitlebar.widget.closebutton(client),
-            layout = lfixed.horizontal(),
-        },
-        layout = lalign.horizontal,
     }
 end
 

theme/init.lua

@@ -9,6 +9,11 @@ local theme = {}
 
 --- Basic
 theme.font = "Noto Mono 9"
+theme.border_width = 0
+
+--- Clients
+theme.client_corner_radius_top = 9
+theme.client_corner_radius_bottom = 4
 
 --- Tags
 theme.hometag_master_width_factor = 0.65

ui/titlebar/init.lua

@@ -0,0 +1,16 @@
+local nice = require "awesome-wm-nice"
+
+local titlebar = { mt = {} }
+
+function titlebar.new(client)
+    -- We need first to  manually set the base color because of how nice is designed
+    client._nice_base_color = nice.config.titlebar_color
+
+    nice.add_window_decoration(client)
+end
+
+function titlebar.mt:__call(client)
+    return titlebar.new(client)
+end
+
+return setmetatable(titlebar, titlebar.mt)