From df967aabe8d30055e231041dbc46291d228fffc2 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Fri, 16 Nov 2007 13:51:57 +0100 Subject: Export XMonadFont's constructors, use those constructors in XMonad.Prompt darcs-hash:20071116125157-a5988-4d24d051381c8ccc531cfab34a052098497a8cc9.gz --- XMonad/Prompt.hs | 4 ++-- XMonad/Util/Font.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'XMonad') diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 6d1a85e..05c5cd4 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -445,7 +445,7 @@ printPrompt drw = do in (prt ++ a, [head b], tail b) ht = height c (fsl,psl) = (textWidth fs *** textWidth fs) (f,p) - (_,asc,desc,_) <- io $ textExtentsXMF (dpy st) (Left fs) str + (_,asc,desc,_) <- io $ textExtentsXMF (dpy st) (Core fs) str let y = fi $ ((ht - fi (asc + desc)) `div` 2) + fi asc x = (asc + desc) `div` 2 fgcolor <- io $ initColor d $ fgColor c @@ -511,7 +511,7 @@ getComplWinDim compl = do (x,y) = case position c of Top -> (0,ht) Bottom -> (0, (0 + rem_height - actual_height)) - (_,asc,desc,_) <- io $ textExtentsXMF (dpy st) (Left fs) $ head compl + (_,asc,desc,_) <- io $ textExtentsXMF (dpy st) (Core fs) $ head compl let yp = fi $ (ht + fi (asc - desc)) `div` 2 xp = (asc + desc) `div` 2 yy = map fi . take (fi actual_rows) $ [yp,(yp + ht)..] diff --git a/XMonad/Util/Font.hs b/XMonad/Util/Font.hs index 12e7fa9..b244fb5 100644 --- a/XMonad/Util/Font.hs +++ b/XMonad/Util/Font.hs @@ -17,7 +17,7 @@ module XMonad.Util.Font ( -- * Usage: -- $usage - XMonadFont + XMonadFont(..) , initXMF , releaseXMF , initCoreFont -- cgit v1.2.3