Made changes to ubuntu 20.04 theme

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",

presets/ubuntu-20.04/core/layout.lua

@@ -71,56 +71,51 @@ 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,
+                layout = wibox.layout.fixed.horizontal,
                 spacing = 3
             },
+            widget = wibox.container.place,
+            halign = "left",
+            fill_horizontal = false,
+        },
         -- Middle widget
-        {
-            widget = wibox.container.background
-        },
-        { -- Right widgets
         wibox.widget.textclock(),
+        { -- Right widgets
             {
-                widget = wibox.container.background,
-                forced_width = (math.abs(s.geometry.width/2)-200)
-            },
-            layout = wibox.layout.fixed.horizontal,
+                require("widgets.drawer")({
+                    wibox.widget.systray()
+                }),
                 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.volume")({}),
                 require("widgets.battery")({
                     percentage = false,
-                style = {
-                    icon_bg_normal = beautiful.topbar_bg
-                }
                 }),
                 s.mylayoutbox,
+                layout = wibox.layout.fixed.horizontal,
                 spacing = 4
             },
+            widget = wibox.container.place,
+            halign = "right",
+            fill_horizontal = false
+        },
     }
 end)
 -- }}}

themes/unity2/icons/drawer-closed.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="drawer-closed.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="6.6340405"
+     inkscape:cx="3.1654917"
+     inkscape:cy="25.097827"
+     inkscape:window-width="1132"
+     inkscape:window-height="576"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid9" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect85"
+       style="fill:#ffffff;fill-rule:evenodd;stroke-width:0.132288"
+       d="M 4.6963541,6.3497502 8.0036458,8.3340001 V 4.3655002 Z"
+       sodipodi:nodetypes="cccc" />
+  </g>
+  <metadata
+     id="metadata676">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>

themes/unity2/icons/drawer-open.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="drawer-open.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#ffffff"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="6.6340405"
+     inkscape:cx="3.1654917"
+     inkscape:cy="25.097827"
+     inkscape:window-width="1024"
+     inkscape:window-height="576"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid9" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       id="rect85"
+       style="fill:#ffffff;fill-rule:evenodd;stroke-width:0.132288"
+       d="M 8.0036458,6.3497502 4.6963541,8.3340001 V 4.3655002 Z"
+       sodipodi:nodetypes="cccc" />
+  </g>
+  <metadata
+     id="metadata602">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>