Merge branch 'rewrite'

master
Mark 2022-07-17 08:42:59 -07:00
commit 995c522adb
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
2 changed files with 21 additions and 10 deletions

View File

@ -46,12 +46,18 @@ end
-- Return current column -- Return current column
function Tagger:get_col() function Tagger:get_col()
return ( (self:get_tag() - 1) % self.cols ) + 1 return (
(self:get_tag() - 1) % self.cols
) + 1
end end
-- Return current row -- Return current row
function Tagger:get_row() function Tagger:get_row()
return math.floor( (self:get_tag() - self:get_col()) / self.cols ) + 1 return math.floor(
(
self:get_tag() - self:get_col()
) / self.cols
) + 1
end end
-- Select a tag by position -- Select a tag by position

View File

@ -58,9 +58,14 @@ tasklist.make = function(screen)
{ {
{ {
{ {
id = "clienticon", widget = wibox.container.place,
widget = awful.widget.clienticon, halign = "center",
forced_width = config.core.clienticon_width valign = "bottom",
fill_vertical = true,
{
id = "clienticon",
widget = awful.widget.clienticon,
},
}, },
margins = beautiful.dpi(3), margins = beautiful.dpi(3),
widget = wibox.container.margin widget = wibox.container.margin
@ -79,7 +84,7 @@ tasklist.make = function(screen)
-- Change background when mouse is over widget -- Change background when mouse is over widget
self:connect_signal("mouse::enter", function(result) self:connect_signal("mouse::enter", function(result)
self:get_children_by_id("top_tab")[1].bg = "#2DA0DA" --self:get_children_by_id("top_tab")[1].bg = "#2DA0DA"
self:get_children_by_id("background")[1].bg = beautiful.color.bar.hover_bg self:get_children_by_id("background")[1].bg = beautiful.color.bar.hover_bg
end) end)
@ -90,9 +95,9 @@ tasklist.make = function(screen)
if c == client.focus then if c == client.focus then
self:get_children_by_id("top_tab")[1].bg = "#2DA0FF" self:get_children_by_id("top_tab")[1].bg = "#2DA0FF"
elseif c.minimized then elseif c.minimized then
self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
else
self:get_children_by_id("top_tab")[1].bg = beautiful.color.bar.hover_bg --beautiful.color.transparent self:get_children_by_id("top_tab")[1].bg = beautiful.color.bar.hover_bg --beautiful.color.transparent
else
self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
end end
end) end)
end, end,
@ -107,9 +112,9 @@ tasklist.make = function(screen)
if c == client.focus then if c == client.focus then
self:get_children_by_id("top_tab")[1].bg = "#2DA0DA" self:get_children_by_id("top_tab")[1].bg = "#2DA0DA"
elseif c.minimized then elseif c.minimized then
self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
else
self:get_children_by_id("top_tab")[1].bg = beautiful.color.bar.hover_bg --beautiful.color.transparent self:get_children_by_id("top_tab")[1].bg = beautiful.color.bar.hover_bg --beautiful.color.transparent
else
self:get_children_by_id("top_tab")[1].bg = "#2DA0DA77"
end end
end, end,
layout = wibox.layout.align.vertical, layout = wibox.layout.align.vertical,