[taffybar] New versions of gtk-sni-tray and status-notifier-item

This commit is contained in:
Ivan Malison 2018-05-12 10:02:30 -07:00
parent 90dfd5bf8c
commit c165225803
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 57 additions and 44 deletions

View File

@ -30,7 +30,7 @@ extra-deps:
- gi-pango-1.0.16 - gi-pango-1.0.16
- gi-xlib-2.0.2 - gi-xlib-2.0.2
- gio-0.13.4.1 - gio-0.13.4.1
- gtk-sni-tray-0.1.2.0 - gtk-sni-tray-0.1.2.1
- gtk-strut-0.1.2.0 - gtk-strut-0.1.2.0
- gtk-traymanager-1.0.1 - gtk-traymanager-1.0.1
- gtk3-0.14.9 - gtk3-0.14.9
@ -39,7 +39,7 @@ extra-deps:
- libxml-sax-0.7.5 - libxml-sax-0.7.5
- rate-limit-1.1.1 - rate-limit-1.1.1
- spool-0.1 - spool-0.1
- status-notifier-item-0.2.1.0 - status-notifier-item-0.2.2.0
- time-units-1.0.0 - time-units-1.0.0
- xml-helpers-1.0.0 - xml-helpers-1.0.0
resolver: lts-11.5 resolver: lts-11.7

View File

@ -5,54 +5,36 @@
@define-color font-color #FFFFFF; @define-color font-color #FFFFFF;
.Contents { .Contents {
padding: 3px; padding-bottom: 2px;
transition: border-color .5s; padding-top: 2px;
padding-right: 2px;
padding-left: 2px;
transition: bordert-color .5s, background-color .5s;
border-radius: 5px; border-radius: 5px;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-color: rgba(1.0, 1.0, 1.0, 0.0); border-color: rgba(1.0, 1.0, 1.0, 0.0);
} }
.Active .Contents, .Visible .Contents { .Active .WorkspaceContents, .Visible .WorkspaceContents {
border-color: #FFFFFF; background-color: rgba(0.0, 0.0, 0.0, 0.5);
}
.Contents {
padding: 5px;
} }
.InnerPad { .InnerPad {
padding: 4px; padding-bottom: 5px;
padding-top: 5px;
padding-left: 2px;
padding-right: 2px;
} }
.WorkspaceLabel { .WorkspaceLabel {
padding-right: 3px; padding-right: 3px;
padding-left: 2px; padding-left: 2px;
font-size: 12pt; font-size: 10pt;
}
.IconContainer {
transition: border-color .5s;
border-radius: 0px;
border-bottom: solid;
border-width: 1px;
border-color: rgba(1.0, 1.0, 1.0, 0.0);
}
.IconContainer.Active {
border-color: #FFFFFF;
}
.IconContainer.Urgent {
transition: background-color .5s;
background-color: @urgent-window-color;
}
.IconContainer.Minimized .IconImage {
transition: opacity .5s;
opacity: .3;
}
.IconImage {
transition: opacity .5s;
padding: 0px;
opacity: 1;
} }
.Windows * { .Windows * {
@ -83,8 +65,8 @@
} }
.Taffybar * { .Taffybar * {
font-family: "Fira Sans", sans-serif; font-family: "Noto Sans", sans-serif;
font-size: 12pt; font-size: 10pt;
color: @font-color; color: @font-color;
} }
@ -105,3 +87,32 @@
.OuterPad *:hover { .OuterPad *:hover {
box-shadow: inset 0 -3px #0c7cd5; box-shadow: inset 0 -3px #0c7cd5;
} }
.IconImage {
transition: opacity .5s, background-color .5s;
opacity: 1;
}
.IconContainer {
border-bottom: 0px;
transition: opacity .5s, box-shadow 1s;
padding-bottom: 2px;
opacity: 1;
}
.IconContainer.Active {
border-color: rgba(255, 255, 255, 1.0);
/* background-color: rgba(255, 255, 255, 0.3); */
border-radius: 0px;
opacity: 1;
box-shadow: inset 0 -3px #FFFFFF;
}
.IconContainer.Urgent {
box-shadow: inset 0 -3px @urgent-window-color;
}
.IconContainer.Minimized .IconImage {
transition: opacity .5s;
opacity: .3;
}

View File

@ -46,6 +46,7 @@ import System.Taffybar.SimpleConfig
import System.Taffybar.Widget import System.Taffybar.Widget
import System.Taffybar.Widget.Generic.PollingGraph import System.Taffybar.Widget.Generic.PollingGraph
import System.Taffybar.Widget.Generic.PollingLabel import System.Taffybar.Widget.Generic.PollingLabel
import System.Taffybar.Widget.Util
import System.Taffybar.Widget.Workspaces import System.Taffybar.Widget.Workspaces
import Text.Printf import Text.Printf
import Text.Read hiding (lift) import Text.Read hiding (lift)
@ -53,6 +54,7 @@ import Unsafe.Coerce
buildPadBoxNoShrink orig = liftIO $ do buildPadBoxNoShrink orig = liftIO $ do
widget <- buildPadBox orig widget <- buildPadBox orig
widgetSetClass orig "Contents"
-- toGIWidget widget >>= widgetPreventShrink -- toGIWidget widget >>= widgetPreventShrink
return widget return widget
@ -217,7 +219,7 @@ main = do
, minWSWidgetSize = Nothing , minWSWidgetSize = Nothing
, minIcons = 1 , minIcons = 1
, getIconInfo = myGetIconInfo , getIconInfo = myGetIconInfo
, windowIconSize = 30 , windowIconSize = 25
, widgetGap = 0 , widgetGap = 0
, showWorkspaceFn = hideEmpty , showWorkspaceFn = hideEmpty
, updateRateLimitMicroseconds = 100000 , updateRateLimitMicroseconds = 100000
@ -243,7 +245,7 @@ main = do
] ]
, barPosition = Top , barPosition = Top
, barPadding = 0 , barPadding = 0
, barHeight = (underlineHeight myWorkspacesConfig + windowIconSize myWorkspacesConfig + 15) , barHeight = (windowIconSize myWorkspacesConfig + 25)
, widgetSpacing = 0 , widgetSpacing = 0
} }
workspaces = workspacesNew myWorkspacesConfig workspaces = workspacesNew myWorkspacesConfig

View File

@ -14,22 +14,22 @@ executable imalison-xmonad
main-is: xmonad.hs main-is: xmonad.hs
build-depends: aeson>=0.11.2.1 build-depends: aeson>=0.11.2.1
, X11>=1.8 , X11>=1.8
, base >=4.9 && <4.10 , base >=4.7
, bytestring>=0.10.8.1 , bytestring>=0.10.8.1
, containers>=0.5.7.1 , containers>=0.5.7.1
, directory>=1.2.6.2 , directory>=1.2.6.2
, filepath>=1.4.1.0 , filepath>=1.4.1.0
, gtk-traymanager>=0.1.6
, hostname>=1.0 , hostname>=1.0
, mtl>=2.2.1 , mtl>=2.2.1
, multimap>=1.2.1 , multimap>=1.2.1
, process>=1.4.3.0 , process>=1.4.3.0
, split , split
, taffybar>=0.4.6
, transformers>=0.5.2.0 , transformers>=0.5.2.0
, tuple >= 0.3.0.2 , tuple >= 0.3.0.2
, utf8-string , utf8-string
, xmonad-contrib>=0.13 , xmonad-contrib>=0.13
, xmonad>=0.13 , xmonad>=0.13
hs-source-dirs: . hs-source-dirs: .
src
other-modules: PagerHints
default-language: Haskell2010 default-language: Haskell2010