From 51b2f74771c61f37586ea96ebf8fe63c8e420cec Mon Sep 17 00:00:00 2001 From: Yessiest Date: Wed, 9 Feb 2022 15:07:48 +0000 Subject: [PATCH] apparently i broke awmtk thinking it was broken. apparently my brain was broken because i was editing unity and running unity simplified. --- libs/awmtk.lua | 10 ++++++++-- themes/unity_simplified/theme.lua | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/awmtk.lua b/libs/awmtk.lua index 04e96ac..66da82d 100644 --- a/libs/awmtk.lua +++ b/libs/awmtk.lua @@ -213,7 +213,6 @@ awmtk.style = function(parent,delta,prefix) new_style.inputbox = preprocess.inputbox(_new_style) return new_style end - -- Default variables table defaults = setmetatable({},{ __index = beautiful @@ -236,14 +235,21 @@ defaults.shape_border_color = defaults.shape_border_color or defaults.bg_normal defaults.inner_margin = defaults.inner_margin or 5 defaults.rounding = defaults.rounding or 0 -- Generate classes variables +local new_defaults = {} for _,class in pairs(classes) do for parameter,value in pairs(defaults) do - defaults[class..parameter] = ( + new_defaults[class..parameter] = ( defaults[class..parameter] or value ) end end +for parameter,value in pairs(defaults) do + new_defaults[parameter] = value +end +defaults = setmetatable(new_defaults,{ + __index = beautiful +}) --make icons look less weird defaults.icon_inner_margin = beautiful.icon_inner_margin or 0 --add spacing for lists diff --git a/themes/unity_simplified/theme.lua b/themes/unity_simplified/theme.lua index df1a924..ab48a90 100644 --- a/themes/unity_simplified/theme.lua +++ b/themes/unity_simplified/theme.lua @@ -143,6 +143,12 @@ theme.topbar_bg = { theme.titlebar_rounding = 6 theme.bg_systray = "#3A3A36" theme.prompt_bg = theme.titlebar_bg_normal +theme.wintitle_icon_bg_normal = theme.topbar_bg +theme.wallpapers_icon_bg_normal = theme.topbar_bg +theme.mailbox_icon_bg_normal = theme.topbar_bg +theme.volume_icon_bg_normal = theme.topbar_bg +theme.battery_icon_bg_normal = theme.topbar_bg +theme.username_icon_bg_normal = "wtf" -- Generate taglist squares: local taglist_square_size = dpi(4) theme.taglist_squares_sel = theme_assets.taglist_squares_sel(