Crylia/japanese-srs-trainer-wanikani
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some more bugs related to the new icon implementation

Browse Source
This commit is contained in:
Rene
2022-08-03 04:19:42 +02:00
parent 2422b9a07f
commit 535c763a30
40 changed files with 152 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awesome/src/widgets/audio.lua
View File

@@ -90,7 +90,7 @@ return function(s)
)
-- Signals
Hover_signal(audio_widget, Theme_config.audio.bg, Theme_config.audio.fg)
Hover_signal(audio_widget)
audio_widget:connect_signal(
"button::press",

4
awesome/src/widgets/battery.lua
View File

@@ -67,7 +67,7 @@ return function(battery_kind)
}
-- Color change on mouse over
Hover_signal(battery_widget, Theme_config.battery.bg, Theme_config.battery.fg)
Hover_signal(battery_widget)
-- Open an energy manager on click
battery_widget:connect_signal(
@@ -90,7 +90,7 @@ return function(battery_kind)
---Takes a path and returns the glib object
---@param path string battery device path
---@return UPowerGlib.Device battery battery device object
---@return UPowerGlib.Device | nil battery battery device object
local function get_device_from_path(path)
local devices = upower_glib.Client():get_devices()

2
awesome/src/widgets/bluetooth.lua
View File

@@ -40,7 +40,7 @@ return function(s)
widget = wibox.container.background
}
-- Hover signal to change color when mouse is over
Hover_signal(bluetooth_widget, Theme_config.bluetooth.bg, Theme_config.bluetooth.fg)
Hover_signal(bluetooth_widget)
awesome.connect_signal("state", function(state)
if state then

2
awesome/src/widgets/clock.lua
View File

@@ -58,7 +58,7 @@ return function()
widget = wibox.container.background
}
Hover_signal(clock_widget, Theme_config.clock.bg, Theme_config.clock.fg)
Hover_signal(clock_widget)
return clock_widget
end

6
awesome/src/widgets/cpu_info.lua
View File

@@ -164,7 +164,6 @@ return function(widget, _)
temp_color = Theme_config.cpu_temp.bg_high
temp_icon = icon_dir .. "thermometer-high.svg"
end
Hover_signal(cpu_temp, temp_color, Theme_config.cpu_temp.fg)
cpu_temp.container.cpu_layout.icon_margin.icon_layout.icon:set_image(temp_icon)
cpu_temp:set_bg(temp_color)
cpu_temp.container.cpu_layout.label.text = math.floor(temp) .. "°C"
@@ -186,8 +185,9 @@ return function(widget, _)
end
)
Hover_signal(cpu_usage_widget, Theme_config.cpu_usage.bg, Theme_config.cpu_usage.fg)
Hover_signal(cpu_clock, Theme_config.cpu_freq.bg, Theme_config.cpu_freq.bg)
Hover_signal(cpu_temp)
Hover_signal(cpu_usage_widget)
Hover_signal(cpu_clock)
if widget == "usage" then
return cpu_usage_widget

2
awesome/src/widgets/date.lua
View File

@@ -60,7 +60,7 @@ return function()
}
-- Signals
Hover_signal(date_widget, Theme_config.date.bg, Theme_config.date.fg)
Hover_signal(date_widget)
return date_widget
end

8
awesome/src/widgets/gpu_info.lua
View File

@@ -53,7 +53,6 @@ return function(widget)
end,
widget = wibox.container.background
}
Hover_signal(gpu_usage_widget, Theme_config.gpu_usage.bg, Theme_config.gpu_usage.fg)
local gpu_temp_widget = wibox.widget {
{
@@ -98,6 +97,9 @@ return function(widget)
widget = wibox.container.background
}
Hover_signal(gpu_temp_widget)
Hover_signal(gpu_usage_widget)
-- GPU Utilization
awesome.connect_signal(
"update::gpu_usage",
@@ -113,7 +115,7 @@ return function(widget)
local temp_icon
local temp_color
local temp_num = tonumber(stdout)
local temp_num = tonumber(stdout) or "N/A"
if temp_num then
@@ -128,7 +130,7 @@ return function(widget)
temp_icon = icon_dir .. "thermometer-high.svg"
end
else
temp_num = "NaN"
temp_num = "N/A"
temp_color = Theme_config.gpu_temp.bg_low
temp_icon = icon_dir .. "thermometer-low.svg"
end

4
awesome/src/widgets/kblayout.lua
View File

@@ -214,7 +214,6 @@ return function(s)
keymap = keymap
}
-- TODO: Hover effects, this is more pain than I'm willing to take for now
awesome.connect_signal(
"update::background:kblayout",
function()
@@ -235,7 +234,6 @@ return function(s)
)
end
)
get_kblayout()
kb_layout_item:connect_signal(
@@ -352,7 +350,7 @@ return function(s)
)
-- Signals
Hover_signal(kblayout_widget, Theme_config.kblayout.bg, Theme_config.kblayout.fg)
Hover_signal(kblayout_widget)
local kblayout_keygrabber = awful.keygrabber {
autostart = false,

2
awesome/src/widgets/layout_list.lua
View File

@@ -47,7 +47,7 @@ return function()
}
-- Signals
Hover_signal(layout, Theme_config.layout_list.bg)
Hover_signal(layout)
layout:connect_signal(
"button::press",

2
awesome/src/widgets/network.lua
View File

@@ -328,7 +328,7 @@ return function()
}
-- Signals
Hover_signal(network_widget, Theme_config.network.bg, Theme_config.network.fg)
Hover_signal(network_widget)
network_widget:connect_signal(
"button::press",

2
awesome/src/widgets/power.lua
View File

@@ -50,7 +50,7 @@ return function()
}
-- Signals
Hover_signal(power_widget, Theme_config.power_button.bg, Theme_config.power_button.fg)
Hover_signal(power_widget)
power_widget:connect_signal(
"button::release",

2
awesome/src/widgets/ram_info.lua
View File

@@ -55,7 +55,7 @@ return function()
widget = wibox.container.background
}
Hover_signal(ram_widget, Theme_config.ram_info.bg, Theme_config.ram_info.fg)
Hover_signal(ram_widget)
awesome.connect_signal(
"update::ram_widget",

2
awesome/src/widgets/systray.lua
View File

@@ -28,8 +28,6 @@ return function(s)
end,
bg = Theme_config.systray.bg
}
-- Signals
Hover_signal(systray, Theme_config.systray.bg)
awesome.connect_signal("systray::update", function()
local num_entries = awesome.systray()

56
awesome/src/widgets/taglist.lua
View File

@@ -102,61 +102,7 @@ local list_update = function(widget, buttons, _, _, objects)
})
end
--#region Hover_signal
local old_wibox, old_cursor
tag_widget:connect_signal(
"mouse::enter",
function()
if object == awful.screen.focused().selected_tag then
tag_widget.bg = Theme_config.taglist.bg_focus_hover .. 'dd'
else
tag_widget.bg = Theme_config.taglist.bg .. 'dd'
end
local w = mouse.current_wibox
if w then
old_cursor, old_wibox = w.cursor, w
w.cursor = "hand1"
end
end
)
tag_widget:connect_signal(
"button::press",
function()
if object == awful.screen.focused().selected_tag then
tag_widget.bg = Theme_config.taglist.bg_focus_pressed .. 'dd'
else
tag_widget.bg = Theme_config.taglist.bg .. 'dd'
end
end
)
tag_widget:connect_signal(
"button::release",
function()
if object == awful.screen.focused().selected_tag then
tag_widget.bg = Theme_config.taglist.bg_focus_hover .. 'dd'
else
tag_widget.bg = Theme_config.taglist.bg .. 'dd'
end
end
)
tag_widget:connect_signal(
"mouse::leave",
function()
if object == awful.screen.focused().selected_tag then
tag_widget.bg = Theme_config.taglist.bg_focus
else
tag_widget.bg = Theme_config.taglist.bg
end
if old_wibox then
old_wibox.cursor = old_cursor
old_wibox = nil
end
end
)
--#endregion
Hover_signal(tag_widget)
widget:add(tag_widget)
widget:set_spacing(dpi(6))

59
awesome/src/widgets/tasklist.lua
View File

@@ -115,65 +115,10 @@ local list_update = function(widget, buttons, label, _, objects)
task_widget.container.layout_it.title:set_text('')
end
Hover_signal(task_widget)
widget:add(task_widget)
widget:set_spacing(dpi(6))
--#region Hover_signal
local old_wibox, old_cursor
task_widget:connect_signal(
"mouse::enter",
function()
if object == client.focus then
task_widget.bg = Theme_config.tasklist.bg_focus_hover .. "dd"
else
task_widget.bg = Theme_config.tasklist.bg .. 'dd'
end
local w = mouse.current_wibox
if w then
old_cursor, old_wibox = w.cursor, w
w.cursor = "hand1"
end
end
)
task_widget:connect_signal(
"button::press",
function()
if object == client.focus then
task_widget.bg = Theme_config.tasklist.bg_focus_pressed .. "dd"
else
task_widget.bg = Theme_config.tasklist.bg .. "dd"
end
end
)
task_widget:connect_signal(
"button::release",
function()
if object == client.focus then
task_widget.bg = Theme_config.tasklist.bg_focus_hover .. "dd"
else
task_widget.bg = Theme_config.tasklist.bg .. "dd"
end
end
)
task_widget:connect_signal(
"mouse::leave",
function()
if object == client.focus then
task_widget.bg = Theme_config.tasklist.bg_focus
else
task_widget.bg = Theme_config.tasklist.bg
end
if old_wibox then
old_wibox.cursor = old_cursor
old_wibox = nil
end
end
)
--#endregion
end
return widget
end