summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2014-12-02 04:57:45 +0100
committerjao <jao@gnu.org>2014-12-02 04:57:45 +0100
commit0ba96383c08d2c8babca267788d064af37a8c927 (patch)
tree12a8dad12121e43a6d9cb3b26ce36d5de565e3db
parent2850217cae140ff3142c66bbbbaa68facaa0976b (diff)
parente1e202ba27918069be2defc5c4881d5621ca3ce8 (diff)
downloadxmobar-0ba96383c08d2c8babca267788d064af37a8c927.tar.gz
xmobar-0ba96383c08d2c8babca267788d064af37a8c927.tar.bz2
Merge branch 'master' of https://github.com/ryantm/xmobar into ryantm-master
Conflicts: src/Xmobar.hs
-rw-r--r--src/Xmobar.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Xmobar.hs b/src/Xmobar.hs
index 33feeb0..766b2fe 100644
--- a/src/Xmobar.hs
+++ b/src/Xmobar.hs
@@ -318,7 +318,8 @@ printStrings dr gc fontst offs a sl@((s,c,l):xs) = do
boffs = borderOffset (border conf) (borderWidth conf)
Rectangle _ _ wid ht = rect r
totSLen = foldr (\(_,_,len) -> (+) len) 0 sl
- valign = boffs-1 + (fi ht + fi (as + ds)) `div` 2
+ verticalMargin = (fi ht) - fi (as + ds) + boffs
+ valign = (fi ht) - (fi ds) - (verticalMargin `div` 2)
remWidth = fi wid - fi totSLen
offset = case a of
C -> (remWidth + offs) `div` 2