From 6d48eb51cfaab42952654688795476d12147e806 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 4 Mar 2017 03:59:38 -0800 Subject: [PATCH] [taffybar] Add underlines to a few more widgets --- dotfiles/config/taffybar/taffybar.hs | 58 +++++++++++++++++++--------- dotfiles/config/taffybar/taffybar.rc | 3 ++ 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index 41920818..1432b35e 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -1,24 +1,28 @@ module Main where -import Data.Char (toLower) +import Data.Char (toLower) -import Text.Read -import Data.List -import Data.Maybe -import System.Directory -import System.FilePath.Posix -import System.Information.CPU -import System.Information.Memory -import System.Taffybar -import System.Taffybar.IconImages -import System.Taffybar.MPRIS2 -import System.Taffybar.Pager -import System.Taffybar.SimpleClock -import System.Taffybar.Systray -import System.Taffybar.TaffyPager -import System.Taffybar.Widgets.PollingGraph -import System.Taffybar.WorkspaceHUD -import System.Environment +import Data.List +import Data.Maybe +import qualified Graphics.UI.Gtk as Gtk +import qualified Graphics.UI.Gtk.Abstract.Widget as W +import qualified Graphics.UI.Gtk.Layout.Table as T +import System.Directory +import System.Environment +import System.FilePath.Posix +import System.Information.CPU +import System.Information.Memory +import System.Taffybar +import System.Taffybar.IconImages +import System.Taffybar.MPRIS2 +import System.Taffybar.Pager +import System.Taffybar.SimpleClock +import System.Taffybar.Systray +import System.Taffybar.TaffyPager +import System.Taffybar.Widgets.PollingGraph +import System.Taffybar.WorkspaceHUD +import Text.Printf +import Text.Read memCallback = do mi <- parseMeminfo @@ -35,6 +39,22 @@ fallbackIcons _ klass | isInfixOf "Kodi" klass = IIFilePath $ resourcesDirectory "kodi.png" | otherwise = IIColor $ (0xFF, 0xFF, 0, 0xFF) +underlineWidget buildWidget name = do + w <- buildWidget + t <- T.tableNew 2 1 False + u <- Gtk.eventBoxNew + + W.widgetSetSizeRequest u (-1) $ 2 + + T.tableAttach t w 0 1 0 1 [T.Expand] [T.Expand] 0 0 + T.tableAttach t u 0 1 1 2 [T.Fill] [T.Shrink] 0 0 + + Gtk.widgetSetName u $ (printf "%s-underline" name :: String) + + Gtk.widgetShowAll t + + return $ Gtk.toWidget t + myGetIconInfo = windowTitleClassIconGetter False fallbackIcons @@ -78,7 +98,7 @@ main = do defaultTaffybar defaultTaffybarConfig { startWidgets = [hud] - , endWidgets = [tray, clock, mem, cpu, mpris] + , endWidgets = [underlineWidget tray "tray", underlineWidget clock "clock", mem, cpu, mpris] , monitorNumber = monitorNumber , monitorFilter = allMonitors , barPosition = Top diff --git a/dotfiles/config/taffybar/taffybar.rc b/dotfiles/config/taffybar/taffybar.rc index 45c96c9c..e35baea4 100644 --- a/dotfiles/config/taffybar/taffybar.rc +++ b/dotfiles/config/taffybar/taffybar.rc @@ -84,3 +84,6 @@ widget "*Workspace-icon*-urgent*" style "taffybar-icon-urgent" widget "*WorkspaceHUD-*" style "taffybar-hover-button" widget "*WorkspaceHUD-*" style "taffybar-hover-button" + +widget "*clock-underline*" style "taffybar-workspace-border-active" +widget "*tray-underline*" style "taffybar-workspace-border-hidden"