Merge pull request #135 from undefinedDarkness/fixes

[3/3] Fixes to titlebar indicator and tasklist tabbed indicator

docs/theme.md

@@ -80,6 +80,19 @@ theme.task_preview_widget_border_color = "#ffffff"   -- The border color of the
 theme.task_preview_widget_border_width = 3           -- The border width of the widget
 theme.task_preview_widget_margin = 0                 -- The margin of the widget
 
+-- tabbed misc widget(s)
+theme.bling_tabbed_misc_titlebar_indicator = {
+    layout_spacing = dpi(4),
+    icon_size = dpi(20),
+    icon_margin = dpi(4),
+    bg_color_focus = "#ff0000",
+    bg_color = "#00000000",
+    icon_shape = function(cr, w, h)
+        gears.shape.rounded_rect(cr, w, h, 0)
+    end,
+    layout = wibox.layout.fixed.horizontal
+}
+
 -- window switcher widget
 theme.window_switcher_widget_bg = "#000000"              -- The bg color of the widget
 theme.window_switcher_widget_border_width = 3            -- The border width of the widget

docs/widgets/tabbed_misc.md

@@ -16,9 +16,12 @@ To use the task list indicator:
 
 ```lua
 bling.widget.tabbed_misc.titlebar_indicator(client, {
+    layout = wibox.layout.fixed.vertical,
     layout_spacing = dpi(5), -- Set spacing in between items
     icon_size = dpi(24), -- Set icon size
     icon_margin = 0, -- Set icon margin
+    fg_color = "#cccccc", -- Normal color for text
+    fg_color_focus = "#ffffff", -- Color for focused text
     bg_color_focus = "#282828", -- Color for the focused items
     bg_color = "#1d2021", -- Color for normal / unfocused items
     icon_shape = gears.shape.circle -- Set icon shape,
@@ -35,7 +38,12 @@ bling.widget.tabbed_misc.titlebar_indicator(client, {
         },
         widget = wibox.container.margin,
         margins = 2,
-        id = 'click_role'
+        id = 'bg_role',
+        update_callback = function(self, client, group)
+            if client == group.clients[group.focused_idx] then
+                self.margins = 5
+            end
+        end
     }
 })
 ```

widget/tabbed_misc/custom_tasklist.lua

@@ -6,50 +6,46 @@ local dpi = require("beautiful.xresources").apply_dpi
 
 local function tabobj_support(self, c, index, clients)
  	-- Self is the background widget in this context
-    if not c.bling_tabbed then
+	if not c.bling_tabbed and #c.bling_tabbed.clients > 1 then
 		return
 	end
 
 	local group = c.bling_tabbed
 	
-    -- Single item tabbed group's dont get special rendering
-    if #group.clients > 1 then
+	-- TODO: Allow customization here
+	local layout_v = wibox.widget {
+		vertical_spacing = dpi(2),
+		horizontal_spacing = dpi(2),
+		layout = wibox.layout.grid.horizontal,
+		forced_num_rows = 2,
+		forced_num_cols = 2,
+		homogeneous = true
+	}
+
 	local wrapper = wibox.widget({
-            {
-                -- This is so dumb... but it works so meh
-                {
-                    id = "row1",
-                    layout = wibox.layout.flex.horizontal,
-                },
-                {
-                    id = "row2",
-                    layout = wibox.layout.flex.horizontal,
-                },
-                spacing = dpi(2),
-                layout = wibox.layout.fixed.vertical,
-            },
+		layout_v,
 		id = "click_role",
 		widget = wibox.container.margin,
 		margins = dpi(5),
 	})
 
+	-- To get the ball rolling.
 	for idx, c in ipairs(group.clients) do
-            if c and c.icon then
-                -- TODO: Don't do this in a -1iq way
-                if idx <= 2 then
-                    wrapper
-                        :get_children_by_id("row1")[1]
-                        :add(awful.widget.clienticon(c))
-                else
-                    wrapper
-                        :get_children_by_id("row2")[1]
-                        :add(awful.widget.clienticon(c))
-                end
-            end
-        end
+		if not (c and c.icon) then goto skip end
 
-        self.widget = wrapper
+		-- Add to the last layout
+		layout_v:add(wibox.widget {
+			{
+				widget = awful.widget.clienticon,
+				client = c
+			},
+			widget = wibox.container.constraint,
+			width = dpi(24),
+			height = dpi(24)
+		})
+		::skip::
 	end
+	self.widget = wrapper
 end
 
 return tabobj_support

widget/tabbed_misc/titlebar_indicator.lua

@@ -26,9 +26,12 @@ return function(c, opts)
 		icon_margin = dpi(4),
 		bg_color_focus = "#ff0000",
 		bg_color = "#00000000",
+		fg_color = "#fafafa",
+		fg_color_focus = "#e0e0e0",
 		icon_shape = function(cr, w, h)
 			gears.shape.rounded_rect(cr, w, h, 0)
 		end,
+		layout = wibox.layout.fixed.horizontal,
 	}, gears.table.join(
 		opts,
 		beautiful.bling_tabbed_misc_titlebar_indicator
@@ -36,18 +39,14 @@ return function(c, opts)
 
 	-- Container to store icons
 	local tabbed_icons = wibox.widget({
-        layout = wibox.layout.fixed.horizontal,
+		layout = opts.layout,
 		spacing = opts.layout_spacing,
 	})
 
-    awesome.connect_signal(
-        "bling::tabbed::client_removed",
-        function(_, removed_c)
+	awesome.connect_signal("bling::tabbed::client_removed", function(_, removed_c)
 		-- Remove from list
 		for idx, icon in ipairs(tabbed_icons.children) do
-                if
-                    icon:get_children_by_id("icon_role")[1].client == removed_c
-                then
+			if icon._client == removed_c then
 				tabbed_icons:remove(idx)
 			end
 		end
@@ -56,8 +55,7 @@ return function(c, opts)
 		if removed_c == c then
 			tabbed_icons:reset()
 		end
-        end
-    )
+	end)
 
 	local function recreate(group)
 		if tbl_contains(group.clients, c) then
@@ -70,7 +68,8 @@ return function(c, opts)
 			end
 
 			for idx, client in ipairs(group.clients) do
-                local widget = wibox.widget(opts.widget_template or {
+				local widget = wibox.widget(
+					opts.widget_template or {
 					{
 						{
 							{
@@ -82,10 +81,8 @@ return function(c, opts)
 							margins = opts.icon_margin,
 							widget = wibox.container.margin,
 						},
-                        bg = (client == focused) and opts.bg_color_focus
-                            or opts.bg_color,
 						shape = opts.icon_shape,
-                        id = "click_role",
+						id = "bg_role",
 						widget = wibox.container.background,
 					},
 					halign = "center",
@@ -93,6 +90,13 @@ return function(c, opts)
 					widget = wibox.container.place,
 				})
 
+				widget._client = client
+
+				-- No creation call back since this would be called on creation & every time the widget updated.
+				if opts.widget_template and opts.widget_template.update_callback then
+					opts.widget_template.update_callback(widget, client, group)
+				end
+
 				-- Add icons & etc
 				for _, w in ipairs(widget:get_children_by_id("icon_role")) do
 					-- TODO: Allow fallback icon?
@@ -100,10 +104,21 @@ return function(c, opts)
 					w.client = client
 				end
 
-                for _, w in ipairs(widget:get_children_by_id("click_role")) do
+				for _, w in ipairs(widget:get_children_by_id("bg_role")) do
 					w:add_button(awful.button({}, 1, function()
 						tabbed_module.switch_to(group, idx)
 					end))
+					if client == focused then
+						w.bg = opts.bg_color_focus
+						w.fg = opts.fg_color_focus
+					else
+						w.bg = opts.bg_color
+						w.fg = opts.fg_color
+					end
+				end
+
+				for _, w in ipairs(widget:get_children_by_id("text_role")) do
+					w.text = client.name
 				end
 
 				tabbed_icons:add(widget)

widget/tag_preview.lua

@@ -38,6 +38,7 @@ local function draw_widget(
     for i, c in ipairs(t:clients()) do
         if not c.hidden and not c.minimized then
 
+
             local img_box = wibox.widget ({
                 resize = true,
                 forced_height = 100 * scale,
@@ -206,6 +207,8 @@ local enable = function(opts)
 
         tag_preview_box.maximum_width = scale * geo.width + margin * 2
         tag_preview_box.maximum_height = scale * geo.height + margin * 2
+
+
         tag_preview_box.widget = draw_widget(
             t,
             tag_preview_image,
@@ -240,4 +243,4 @@ local enable = function(opts)
     end)
 end
 
-return { enable = enable }
+return {enable = enable, draw_widget = draw_widget}

widget/task_preview.lua

@@ -196,4 +196,4 @@ local enable = function(opts)
     end)
 end
 
-return { enable = enable }
+return { enable = enable, draw_widget = draw_widget }