Merge branch 'BlingCorp:master' into playerctl_metadata_v2

bling-dev-1.rockspec

@@ -31,6 +31,7 @@ build = {
        ["bling.helpers.filesystem"] = "helpers/filesystem.lua",
        ["bling.helpers.shape"] = "helpers/shape.lua",
        ["bling.helpers.time"] = "helpers/time.lua",
+	   ["bling.helpers.icon_theme"] = "helpers/icon_theme.lua",
        ["bling.layout"] = "layout/init.lua",
        ["bling.layout.centered"] = "layout/centered.lua",
        ["bling.layout.deck"] = "layout/deck.lua",

layout/deck.lua

@@ -5,6 +5,7 @@ mylayout.name = "deck"
 function mylayout.arrange(p)
     local area = p.workarea
     local t = p.tag or screen[p.screen].selected_tag
+    local mwfact = t.master_width_factor
     local client_count = #p.clients
 
     if client_count == 1 then
@@ -19,8 +20,8 @@ function mylayout.arrange(p)
         return
     end
 
-    local xoffset = area.width * 0.1 / (client_count - 1)
-    local yoffset = area.height * 0.1 / (client_count - 1)
+    local xoffset = area.width * 0.5 * (1 - mwfact) / (client_count - 1)
+    local yoffset = area.height * 0.5 * (1 - mwfact) / (client_count - 1)
 
     for idx = 1, client_count do
         local c = p.clients[idx]

widget/tabbar/modern.lua

@@ -108,7 +108,7 @@ local function create(c, focused_bool, buttons, inactive_bool)
         },
         text_temp,
         nill,
-        expand = "none",
+        expand = "inside",
         layout = wibox.layout.align.horizontal,
     })
 
@@ -131,9 +131,10 @@ local function create(c, focused_bool, buttons, inactive_bool)
         tab_content = wibox.widget({
             {
                 awful.widget.clienticon(c),
-                top = dpi(10),
+                top = dpi(6),
                 left = dpi(15),
-                bottom = dpi(10),
+                right = dpi(10),
+                bottom = dpi(6),
                 widget = wibox.container.margin,
             },
             text_temp,
@@ -144,7 +145,7 @@ local function create(c, focused_bool, buttons, inactive_bool)
                 bottom = dpi(10),
                 widget = wibox.container.margin,
             },
-            expand = "none",
+            expand = "inside",
             layout = wibox.layout.align.horizontal,
         })
     end