From 6d7070b24d6ed8509319111204357f81c6d8e8cd Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 6 Aug 2021 12:33:43 -0600
Subject: [PATCH] [taffybar] Update look to navy/bottomLeft workspace labels

---
 dotfiles/config/taffybar/taffybar     |  2 +-
 dotfiles/config/taffybar/taffybar.css | 44 ++++++++++++++++-----------
 dotfiles/config/taffybar/taffybar.hs  |  9 ++++--
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index f047118e..0b30a778 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit f047118e519edef36f5a0fde3d1d9c0d4d0a56c6
+Subproject commit 0b30a778689902c54577306cd73ebb7ba79f8c6e
diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css
index 5ec8d545..77e2c218 100644
--- a/dotfiles/config/taffybar/taffybar.css
+++ b/dotfiles/config/taffybar/taffybar.css
@@ -3,6 +3,7 @@
 @define-color black #000000;
 @define-color taffy-blue #0c7cd5;
 @define-color taffy-navy rgb(25, 30, 55);
+@define-color taffy-red rgba(255, 65, 81, 1.0);
 
 @define-color active-window-color @white;
 @define-color urgent-window-color @taffy-blue;
@@ -15,9 +16,10 @@
 .taffy-window * {
 	font-family: "Noto Sans", sans-serif;
 	font-size: 10pt;
-	font-weight: bold;2
+	font-weight: bold;
 	color: @font-color;
 	border-radius: 4px;
+	text-shadow: 2px 2px @black;
 }
 
 .taffy-box {
@@ -33,33 +35,27 @@
 }
 
 .contents {
-	padding: 3px;
+	padding: 2px;
 	transition: background-color .5s;
+	border-color: @white;
+	opacity: 1;
 	/* border-radius: 6px; */
 }
 
 /* Workspaces styling */
 
 .workspace-label {
-	padding-right: 3px;
+	padding-right: 4px;
 	padding-left: 2px;
-	font-size: 12pt;
-	color: rgba(255.0, 255.0, 255.0, 1.0);
+	padding-top: 0px;
+	font-size: 10pt;
+	color: @white;
 	opacity: 1;
 	font-weight: bold;
+	transition: color .5s;
+	text-shadow: 2px 2px @black;
 }
 
-.active .workspace-label {
-	padding-right: 3px;
-	padding-left: 2px;
-	font-size: 14pt;
-	color: rgba(1.0, 1.0, 1.0, 0.0);
-}
-
-
-.contents {
-	/* background-color: rgba(0.0, 0.0, 0.0, 0.85); */
-}
 
 .contents .window-icon {
 	opacity: .5;
@@ -70,12 +66,24 @@
 }
 
 .active .contents {
-	background-color: rgba(255, 65, 81, 1.0);
+	background-color: rgba(255.0, 255.0, 255.0, 0.2);
+	opacity: 1;
+}
+
+.overlay-box {
+	transition: background-color .5s;
+}
+
+.active .overlay-box {
+	padding: 0px;
+	/* background-color: rgba(0, 0, 0, 1.0); */
+	border-color: @white;
+	border-width: 3px;
 	opacity: 1;
 }
 
 .visible .contents {
-	background-color: rgba(255, 65, 81, 1.0);
+	border-color: @white;
 }
 
 .window-icon-container {
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index abcfda88..6055ce70 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -17,6 +17,8 @@ import           Data.List.Split
 import qualified Data.Map as M
 import           Data.Maybe
 import qualified Data.Text
+import qualified GI.Gtk as Gtk
+import qualified GI.Gtk.Objects.Overlay as Gtk
 import           Data.Time
 import           Network.HostName
 import           StatusNotifier.Tray
@@ -86,7 +88,7 @@ memCfg = myGraphConfig
   }
 
 cpuCfg = myGraphConfig
-  { graphDataColors = [(0, 1, 0, 1), (1, 0, 1, 0.5)]
+  { graphDataColors = [red, (1, 0, 1, 0.5)]
   , graphLabel = Just "cpu"
   }
 
@@ -160,6 +162,7 @@ main = do
         , showWorkspaceFn = hideEmpty
         , updateRateLimitMicroseconds = 100000
         , labelSetter = workspaceNamesLabelSetter
+        , widgetBuilder = buildLabelOverlayController
         }
       workspaces = workspacesNew myWorkspacesConfig
       myClock =
@@ -212,7 +215,7 @@ main = do
         , endWidgets = fullEndWidgets
         , barPosition = Top
         , barPadding = 0
-        , barHeight = 30
+        , barHeight = 50
         , cssPath = cssFilePath
         }
       selectedConfig =
@@ -224,7 +227,7 @@ main = do
             , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
             )
           , ( "ryzen-shine"
-            , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
+            , baseConfig { endWidgets = fullEndWidgets, barHeight = 45 }
             )
           , ( "ivanm-dfinity-razer"
             , baseConfig { endWidgets = shortLaptopEndWidgets, barHeight = 42 }