This commit is contained in:
Crylia
2022-01-06 16:27:25 +01:00
parent 72e7dd1dde
commit 39179f06b7
13 changed files with 333 additions and 52 deletions

View File

@@ -62,8 +62,8 @@ return function ()
local battery_tooltip = awful.tooltip{
objects = {battery_widget},
text = "",
mode = "inside",
align = "right",
mode = "outside",
preferred_alignments = "middle",
margins = dpi(10)
}

View File

@@ -43,8 +43,8 @@ return function ()
local bluetooth_tooltip = awful.tooltip{
objects = {bluetooth_widget},
text = "",
mode = "inside",
align = "right",
mode = "outside",
preferred_alignments = "middle",
margins = dpi(10)
}

View File

@@ -75,7 +75,7 @@ return function ()
local xkeyboard_country_code = {
{"ad", "", "AND"}, -- Andorra
{"af", "", "AFG"}, -- Afganistan
{"af", "", "AFG"}, -- Afghanistan
{"al", "", "ALB"}, -- Albania
{"am", "", "ARM"}, -- Armenia
{"ara", "", "ARB"}, -- Arabic

View File

@@ -72,8 +72,8 @@ return function ()
local network_tooltip = awful.tooltip{
text = "Loading",
objects = {network_widget},
mode = "inside",
align = "right",
mode = "outside",
preferred_alignments = "middle",
margins = dpi(10)
}

View File

@@ -26,6 +26,7 @@ return function (s)
width = dpi(100),
strategy = "exact",
layout = wibox.container.constraint,
id = "container"
},
widget = wibox.container.background,
shape = function (cr, width, height)
@@ -34,7 +35,7 @@ return function (s)
bg = color.color["BlueGrey800"]
}
-- Signals
--hover_signal(systray, color.color["Red200"])
hover_signal(systray.container, color.color["Red200"])
return systray
end

View File

@@ -90,10 +90,12 @@ local list_update = function (widget, buttons, label, data, objects)
tag_widget:buttons(create_buttons(buttons, object))
local text, bg_color, bg_image, icon, args = label(object, tag_label)
local naughty = require("naughty")
tag_label:set_text(object.index)
if object == awful.screen.focused().selected_tag then
if object.urgent == true then
tag_widget:set_bg(color.color["RedA200"])
tag_widget:set_fg(color.color["Grey900"])
elseif object == awful.screen.focused().selected_tag then
tag_widget:set_bg(color.color["White"])
tag_widget:set_fg(color.color["Grey900"])
else

View File

@@ -6,45 +6,42 @@ local color = require('theme.crylia.colors')
local list_update = function (widget, buttons, label, data, objects)
widget:reset()
for i, object in ipairs(objects) do
local task_icon = wibox.widget{
nil,
{
id = "icon",
resize = true,
widget = wibox.widget.imagebox
},
nil,
layout = wibox.layout.align.horizontal
}
local task_icon_margin = wibox.widget{
task_icon,
forced_width = dpi(33),
margins = dpi(3),
widget = wibox.container.margin
}
local task_title = wibox.widget{
text = "",
align = "center",
valign = "center",
visible = true,
widget = wibox.widget.textbox
}
local task_widget = wibox.widget{
{
{
task_icon_margin,
task_title,
layout = wibox.layout.fixed.horizontal
{
{
nil,
{
id = "icon",
resize = true,
widget = wibox.widget.imagebox
},
nil,
layout = wibox.layout.align.horizontal,
id = "layout_icon"
},
forced_width = dpi(33),
margins = dpi(3),
widget = wibox.container.margin,
id = "margin"
},
{
text = "",
align = "center",
valign = "center",
visible = true,
widget = wibox.widget.textbox,
id = "title"
},
layout = wibox.layout.fixed.horizontal,
id = "layout_it"
},
right = dpi(5),
left = dpi(5),
widget = wibox.container.margin
widget = wibox.container.margin,
id = "container"
},
bg = color.color["White"],
fg = color.color["Grey900"],
@@ -87,11 +84,11 @@ local list_update = function (widget, buttons, label, data, objects)
task_widget:buttons(create_buttons(buttons, object))
local text, bg, bg_image, icon, args = label(object, task_title)
local text, bg, bg_image, icon, args = label(object, task_widget.container.layout_it.title)
if object == client.focus then
if text == nil or text == '' then
task_title:set_margins(0)
task_widget.container.layout_it.title:set_margins(0)
else
local text_full = text:match('>(.-)<')
if text_full then
@@ -104,12 +101,12 @@ local list_update = function (widget, buttons, label, data, objects)
end
task_widget:set_bg(color.color["White"])
task_widget:set_fg(color.color["Grey900"])
task_title:set_text(text)
task_widget.container.layout_it.title:set_text(text)
else
task_widget:set_bg("#3A475C")
task_title:set_text('')
task_widget.container.layout_it.title:set_text('')
end
task_icon.icon:set_image(Get_icon("Papirus-Dark", object))
task_widget.container.layout_it.margin.layout_icon.icon:set_image(Get_icon("Papirus-Dark", object))
widget:add(task_widget)
widget:set_spacing(dpi(6))