From 64e9b9a3cb6d677ff482f88777f7b989cdbba81f Mon Sep 17 00:00:00 2001 From: Hydroxycarbamide Date: Sun, 28 Aug 2022 23:43:57 +0200 Subject: [PATCH] Change style --- src/assets/rules.txt | 1 + src/core/notifications.lua | 66 +++++++++++++++----------------------- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/src/assets/rules.txt b/src/assets/rules.txt index e69de29..49e195a 100644 --- a/src/assets/rules.txt +++ b/src/assets/rules.txt @@ -0,0 +1 @@ +Steam; \ No newline at end of file diff --git a/src/core/notifications.lua b/src/core/notifications.lua index 0c53685..be337e8 100644 --- a/src/core/notifications.lua +++ b/src/core/notifications.lua @@ -45,14 +45,14 @@ naughty.connect_signal( function(n) if n.urgency == "critical" then n.title = string.format("%s", - color["RedA200"], n.title) or "" - n.message = string.format("%s", color["Red200"], n.message) or "" - n.app_name = string.format("%s", color["RedA400"], n.app_name) or "" + cat["Red"], n.title) or "" + n.message = string.format("%s", cat["Red"], n.message) or "" + n.app_name = string.format("%s", cat["Red"], n.app_name) or "" n.bg = cat["Surface0"] else n.title = string.format("%s", - color["Pink200"], n.title) or "" - n.message = string.format("%s", "#ffffffaa", n.message) or "" + color["White"], n.title) or "" + n.message = string.format("%s", cat['Text'], n.message) or "" n.bg = cat["Surface0"] n.timeout = n.timeout or 3 end @@ -168,10 +168,22 @@ naughty.connect_signal( { { { - image = gears.color.recolor_image(icondir .. "notification-outline.svg", color["Teal200"]), - resize = false, - widget = wibox.widget.imagebox + { + image = n.icon, + resize = true, + widget = wibox.widget.imagebox, + clip_shape = function(cr, width, height) + gears.shape.circle(cr, width, height) + end + }, + width = naughty.config.defaults.icon_size, + height = naughty.config.defaults.icon_size, + strategy = "exact", + widget = wibox.container.constraint }, + left = dpi(5), + bottom = dpi(5), + top = dpi(5), right = dpi(5), widget = wibox.container.margin }, @@ -183,7 +195,7 @@ naughty.connect_signal( }, layout = wibox.layout.fixed.horizontal }, - fg = color["Teal200"], + fg = cat["Peach"], widget = wibox.container.background }, margins = dpi(10), @@ -197,7 +209,7 @@ naughty.connect_signal( widget = wibox.widget.textbox }, id = "background", - fg = color["Teal200"], + fg = cat["Peach"], widget = wibox.container.background }, { @@ -220,7 +232,7 @@ naughty.connect_signal( id = "arc_chart" }, id = "background", - fg = color["Teal200"], + fg = cat["Peach"], bg = cat["Surface0"], widget = wibox.container.background }, @@ -246,32 +258,6 @@ naughty.connect_signal( widget = wibox.container.background }, { - { - { - { - { - image = n.icon, - resize = true, - widget = wibox.widget.imagebox, - clip_shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 10) - end - }, - width = naughty.config.defaults.icon_size, - height = naughty.config.defaults.icon_size, - strategy = "exact", - widget = wibox.container.constraint - }, - halign = "center", - valign = "top", - widget = wibox.container.place - }, - left = dpi(20), - bottom = dpi(15), - top = dpi(15), - right = dpi(10), - widget = wibox.container.margin - }, { { { @@ -288,8 +274,8 @@ naughty.connect_signal( }, layout = wibox.layout.fixed.vertical }, - left = dpi(10), - bottom = dpi(10), + left = dpi(20), + bottom = dpi(20), top = dpi(10), right = dpi(20), widget = wibox.container.margin @@ -355,7 +341,7 @@ naughty.connect_signal( ) end - Hover_signal(close, cat["Surface0"], color["Teal200"]) + Hover_signal(close, cat["Surface0"], cat["Peach"]) close:connect_signal( "button::press",