From 579c46f4f44b6ffe1d2d7534e9ce6de692298453 Mon Sep 17 00:00:00 2001 From: Yessiest Date: Mon, 18 Apr 2022 13:21:54 +0400 Subject: [PATCH] Made changes to ubuntu 20.04 theme --- core/titlebar.lua | 4 +- presets/ubuntu-20.04/core/layout.lua | 79 +++++++++----------- presets/ubuntu-phone/{ => core}/layout.lua | 0 presets/ubuntu-phone/{ => core}/titlebar.lua | 0 presets/ubuntu-phone/{ => core}/vars.lua | 0 themes/unity2/icons/drawer-closed.svg | 73 ++++++++++++++++++ themes/unity2/icons/drawer-open.svg | 73 ++++++++++++++++++ 7 files changed, 185 insertions(+), 44 deletions(-) rename presets/ubuntu-phone/{ => core}/layout.lua (100%) rename presets/ubuntu-phone/{ => core}/titlebar.lua (100%) rename presets/ubuntu-phone/{ => core}/vars.lua (100%) create mode 100644 themes/unity2/icons/drawer-closed.svg create mode 100644 themes/unity2/icons/drawer-open.svg diff --git a/core/titlebar.lua b/core/titlebar.lua index 6bd711d..45662df 100644 --- a/core/titlebar.lua +++ b/core/titlebar.lua @@ -65,12 +65,12 @@ local menu_widget = menu({ }, { "Stop task", function() - awful.spawn("kill "..tostring(client.focus.pid)) + awful.spawn("kill "..tostring(c.pid)) end }, { "Kill task", function() - awful.spawn("kill -s KILL "..tostring(client.focus.pid)) + awful.spawn("kill -s KILL "..tostring(c.pid)) end }, { "Debug info", diff --git a/presets/ubuntu-20.04/core/layout.lua b/presets/ubuntu-20.04/core/layout.lua index 825f249..556c5be 100644 --- a/presets/ubuntu-20.04/core/layout.lua +++ b/presets/ubuntu-20.04/core/layout.lua @@ -71,55 +71,50 @@ awful.screen.connect_for_each_screen(function(s) }) -- Add widgets to the wibox s.mywibox:setup { + expand = "outside", layout = wibox.layout.align.horizontal, { -- Left widgets - layout = wibox.layout.fixed.horizontal, - require("core.widgets.menu_launcher"), - --require("widgets.polylauncher")({vertical = false}), - --s.mytaglist, - s.mypromptbox, - spacing = 3 + { + require("core.widgets.menu_launcher"), + --require("widgets.polylauncher")({vertical = false}), + --s.mytaglist, + s.mypromptbox, + layout = wibox.layout.fixed.horizontal, + spacing = 3 + }, + widget = wibox.container.place, + halign = "left", + fill_horizontal = false, }, -- Middle widget - { - widget = wibox.container.background - }, + wibox.widget.textclock(), { -- Right widgets - wibox.widget.textclock(), { - widget = wibox.container.background, - forced_width = (math.abs(s.geometry.width/2)-200) + require("widgets.drawer")({ + wibox.widget.systray() + }), + awful.widget.keyboardlayout(), + require("widgets.wallpapers")({ + screen = s, + path = os.getenv("HOME").."/Pictures/Wallpapers/", + }), + require("widgets.mailbox")({ + screen = s, + style = { + rounding = 1, + } + }), + require("widgets.volume")({}), + require("widgets.battery")({ + percentage = false, + }), + s.mylayoutbox, + layout = wibox.layout.fixed.horizontal, + spacing = 4 }, - layout = wibox.layout.fixed.horizontal, - awful.widget.keyboardlayout(), - require("widgets.wallpapers")({ - screen = s, - path = os.getenv("HOME").."/Pictures/Wallpapers/", - style = { - icon_bg_normal = beautiful.topbar_bg - } - }), - require("widgets.mailbox")({ - screen = s, - style = { - rounding = 1, - icon_bg_normal = beautiful.topbar_bg - } - }), - --wibox.widget.systray(), - require("widgets.volume")({ - style = { - icon_bg_normal = beautiful.topbar_bg - } - }), - require("widgets.battery")({ - percentage = false, - style = { - icon_bg_normal = beautiful.topbar_bg - } - }), - s.mylayoutbox, - spacing = 4 + widget = wibox.container.place, + halign = "right", + fill_horizontal = false }, } end) diff --git a/presets/ubuntu-phone/layout.lua b/presets/ubuntu-phone/core/layout.lua similarity index 100% rename from presets/ubuntu-phone/layout.lua rename to presets/ubuntu-phone/core/layout.lua diff --git a/presets/ubuntu-phone/titlebar.lua b/presets/ubuntu-phone/core/titlebar.lua similarity index 100% rename from presets/ubuntu-phone/titlebar.lua rename to presets/ubuntu-phone/core/titlebar.lua diff --git a/presets/ubuntu-phone/vars.lua b/presets/ubuntu-phone/core/vars.lua similarity index 100% rename from presets/ubuntu-phone/vars.lua rename to presets/ubuntu-phone/core/vars.lua diff --git a/themes/unity2/icons/drawer-closed.svg b/themes/unity2/icons/drawer-closed.svg new file mode 100644 index 0000000..f55095d --- /dev/null +++ b/themes/unity2/icons/drawer-closed.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/unity2/icons/drawer-open.svg b/themes/unity2/icons/drawer-open.svg new file mode 100644 index 0000000..02c1d88 --- /dev/null +++ b/themes/unity2/icons/drawer-open.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + +