From 4e01272133e2ef9ca9fed274e4f51a6e7f1a42c5 Mon Sep 17 00:00:00 2001
From: Luca CPZ <luca.cpz@gmail.com>
Date: Tue, 10 Apr 2018 11:24:47 +0200
Subject: [PATCH] vertex: uniform focus sizes; some tweaks; closes #200

---
 freedesktop                          |   2 +-
 lain                                 |   2 +-
 themes/vertex/icons/awesome.png      | Bin 167 -> 168 bytes
 themes/vertex/icons/square_sel.png   | Bin 157 -> 0 bytes
 themes/vertex/icons/square_unsel.png | Bin 158 -> 0 bytes
 themes/vertex/theme.lua              |  21 +++++++++++----------
 6 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 themes/vertex/icons/square_sel.png
 delete mode 100644 themes/vertex/icons/square_unsel.png

diff --git a/freedesktop b/freedesktop
index 8013a6e..4226433 160000
--- a/freedesktop
+++ b/freedesktop
@@ -1 +1 @@
-Subproject commit 8013a6ee26559fb9dbfb94f44cd30dfdbbaf582a
+Subproject commit 4226433ff9a1b431d07ae1592550dbc691c3d1fd
diff --git a/lain b/lain
index a34e72b..9477093 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit a34e72b42bfa681afba744a190d8bb3e26252310
+Subproject commit 94770930fbad1f1641f4268348545adc30c8e186
diff --git a/themes/vertex/icons/awesome.png b/themes/vertex/icons/awesome.png
index b700a1ae8c3d214aab04d03c730cdf315d0ea628..cbded6491a8a1bc2b5aeb0d3b6f364b165db6b63 100644
GIT binary patch
delta 90
zcmV-g0Hyz@0jL3xBo78qOjJby00960|89j$c#&Hjkt7>E;sgo_762YB*wp|402@g}
wK~xyiWB3mS478^}pq?HU!Ki<5`{+mk0DJEb_16e^x&QzG07*qoM6N<$f^W?q#{d8T

delta 114
zcmZ3%xSVl<%ESQajE77tJo;+7sgGP37#P?Bd_r7-^#A|=m)@Lz7sz5P3GxeOaCmkj
z4a7<Ec6VXuV3qX%a-=+69780+lYj8D@oZV{us|+$!n7;)J8DaoFjT+i|GG->eJW5D
NgQu&X%Q~loCIAZRC1n5r

diff --git a/themes/vertex/icons/square_sel.png b/themes/vertex/icons/square_sel.png
deleted file mode 100644
index b94c0c5e84c5b2470b9371b3e1315c0b9d1cd2aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^dLYcm3?y^Qca{Jt&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=kWp4#nt6HW>jgj|wg8_H*Z=?jyH-EHXy&~cD8g70<QL4~@a#q!h?C^)?!wT)
tD(eB{2za_UhDd}bTO43uTP(6ugn`>fsqvxwL{Fd`gQu&X%Q~loCIDWjCE5T0

diff --git a/themes/vertex/icons/square_unsel.png b/themes/vertex/icons/square_unsel.png
deleted file mode 100644
index af19a20ca52fa045a139a1e416bce70c1c92f1a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^dLYcm3?y^Qca{Jt&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=kWp4#T77mGe<4taEx;$l_5c6>uGP;knt5*qiZGP~`2{mf{5U)B6_Cf6<n8Xl
v(7`I}0ptjHx;TbNgeO}ZU|?G;vQvbC+efMKq5MQopd5pztDnm{r-UW|VHzd+

diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua
index b90738b..47fc014 100644
--- a/themes/vertex/theme.lua
+++ b/themes/vertex/theme.lua
@@ -22,6 +22,7 @@ theme.taglist_font                              = "FontAwesome 17"
 theme.fg_normal                                 = "#FFFFFF"
 theme.fg_focus                                  = "#6A95EB"
 theme.bg_focus                                  = "#303030"
+theme.bg_focus2                                 = "#3762B8"
 theme.bg_normal                                 = "#242424"
 theme.fg_urgent                                 = "#CC9393"
 theme.bg_urgent                                 = "#006B8E"
@@ -33,8 +34,8 @@ theme.tooltip_border_width                      = theme.border_width
 theme.menu_height                               = 24
 theme.menu_width                                = 140
 theme.awesome_icon                              = theme.icon_dir .. "/awesome.png"
-theme.taglist_squares_sel                       = theme.icon_dir .. "/square_sel.png"
-theme.taglist_squares_unsel                     = theme.icon_dir .. "/square_unsel.png"
+theme.taglist_squares_sel                       = gears.surface.load_from_shape(3, 30, gears.shape.rectangle, theme.fg_focus)
+theme.taglist_squares_unsel                     = gears.surface.load_from_shape(3, 30, gears.shape.rectangle, theme.bg_focus2)
 theme.panelbg                                   = theme.icon_dir .. "/panel.png"
 theme.bat000charging                            = theme.icon_dir .. "/bat-000-charging.png"
 theme.bat000                                    = theme.icon_dir .. "/bat-000.png"
@@ -104,7 +105,7 @@ theme.titlebar_maximized_button_normal_active   = theme.default_dir.."/titlebar/
 theme.titlebar_maximized_button_focus_active    = theme.default_dir.."/titlebar/maximized_focus_active.png"
 
 -- http://fontawesome.io/cheatsheet
-awful.util.tagnames = { " ", " ", " ", " ", " ", " ", " ", " ", " " }
+awful.util.tagnames = { "", "", "", "", "", "", "", "" }
 
 local markup = lain.util.markup
 
@@ -229,7 +230,7 @@ volicon:buttons(my_table.join (
 ))
 
 -- Wifi carrier and signal strength
-local wificon = wibox.widget.imagebox()
+local wificon = wibox.widget.imagebox(theme.wifidisc)
 local wifitooltip = awful.tooltip({
     objects = { wificon },
     margin_leftright = 15,
@@ -308,7 +309,7 @@ local barcolor = gears.color({
     type  = "linear",
     from  = { 0, 46 },
     to    = { 46, 46 },
-    stops = { {0, theme.bg_focus}, {0.9, "#457be7"} }
+    stops = { {0, theme.bg_focus}, {0.9, theme.bg_focus2} }
 })
 
 local barcolor2 = gears.color({
@@ -324,7 +325,7 @@ end
 
 function theme.vertical_wibox(s)
     -- Create the vertical wibox
-    s.dockheight = (40 *  s.workarea.height)/100
+    s.dockheight = (35 *  s.workarea.height)/100
 
     s.myleftwibox = wibox({ screen = s, x=0, y=s.workarea.height/2 - s.dockheight/2, width = 6, height = s.dockheight, fg = theme.fg_normal, bg = barcolor2, ontop = true, visible = true, type = "dock" })
 
@@ -349,7 +350,7 @@ function theme.vertical_wibox(s)
     s.docktimer = gears.timer{ timeout = 2 }
     s.docktimer:connect_signal("timeout", function()
         local s = awful.screen.focused()
-        s.myleftwibox.width = 6
+        s.myleftwibox.width = 9
         s.layoutb.visible = false
         mylauncher.visible = false
         if s.docktimer.started then
@@ -358,7 +359,7 @@ function theme.vertical_wibox(s)
     end)
     tag.connect_signal("property::selected", function(t)
         local s = t.screen or awful.screen.focused()
-        s.myleftwibox.width = 46
+        s.myleftwibox.width = 38 
         s.layoutb.visible = true
         mylauncher.visible = true
         gears.surface.apply_shape_bounding(s.myleftwibox, dockshape)
@@ -369,14 +370,14 @@ function theme.vertical_wibox(s)
 
     s.myleftwibox:connect_signal("mouse::leave", function()
         local s = awful.screen.focused()
-        s.myleftwibox.width = 6
+        s.myleftwibox.width = 9
         s.layoutb.visible = false
         mylauncher.visible = false
     end)
 
     s.myleftwibox:connect_signal("mouse::enter", function()
         local s = awful.screen.focused()
-        s.myleftwibox.width = 46
+        s.myleftwibox.width = 38
         s.layoutb.visible = true
         mylauncher.visible = true
         gears.surface.apply_shape_bounding(s.myleftwibox, dockshape)