From f55fd96a34f9e59b56f8abb109c04dd120bf7161 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Tue, 30 Dec 2014 01:12:28 +0100
Subject: Linting and defaults

---
 src/XUtil.hsc | 6 ++----
 src/Xmobar.hs | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/XUtil.hsc b/src/XUtil.hsc
index e333a22..2e7e361 100644
--- a/src/XUtil.hsc
+++ b/src/XUtil.hsc
@@ -205,10 +205,8 @@ printString d p (Utf8 fs) gc fc bc x y s =
       io $ wcDrawImageString d p fs gc x y s
 
 #ifdef XFT
-printString dpy drw fs@(Xft fonts) _ fc bc x y s = do
-  (a,d)  <- textExtents fs s
-  gi <- xftTxtExtents' dpy fonts s
-  withDrawingColors dpy drw fc bc $ \draw -> \fc' -> \bc' ->
+printString dpy drw (Xft fonts) _ fc bc x y s = do
+  withDrawingColors dpy drw fc bc $ \draw -> \fc' -> \_ ->
     (drawXftString' draw fc' fonts (toInteger x) (toInteger (y - 2)) s)
 #endif
 
diff --git a/src/Xmobar.hs b/src/Xmobar.hs
index 069c7a6..900feaa 100644
--- a/src/Xmobar.hs
+++ b/src/Xmobar.hs
@@ -343,8 +343,8 @@ verticalOffset ht (Text t) fontst conf
   | otherwise = do
      (as,ds) <- io $ textExtents fontst t
      let bwidth = borderOffset (border conf) (borderWidth conf)
-         verticalMargin = (fi ht) - fi (as + ds) - 2 * fi (abs bwidth)
-     return $ (fi ht) - (fi ds) - (verticalMargin `div` 2) + bwidth + 1
+         verticalMargin = fi ht - fi (as + ds) - 2 * fi (abs bwidth)
+     return $ fi ht - fi ds - (verticalMargin `div` 2) + bwidth + 1
 verticalOffset _ (Icon _) _ conf
   | iconOffset conf > -1 = return $ fi (iconOffset conf)
   | otherwise = do
-- 
cgit v1.2.3