diff options
| author | Spencer Janssen <sjanssen@cse.unl.edu> | 2007-11-16 13:51:57 +0100 |
|---|---|---|
| committer | Spencer Janssen <sjanssen@cse.unl.edu> | 2007-11-16 13:51:57 +0100 |
| commit | df967aabe8d30055e231041dbc46291d228fffc2 (patch) | |
| tree | f784b00fb87395c3f916d47697496e0412dc94ba /XMonad | |
| parent | fd183f2d7de96fe5561b84c826e05a3ac939dad1 (diff) | |
| download | XMonadContrib-df967aabe8d30055e231041dbc46291d228fffc2.tar.gz XMonadContrib-df967aabe8d30055e231041dbc46291d228fffc2.tar.xz XMonadContrib-df967aabe8d30055e231041dbc46291d228fffc2.zip | |
Export XMonadFont's constructors, use those constructors in XMonad.Prompt
darcs-hash:20071116125157-a5988-4d24d051381c8ccc531cfab34a052098497a8cc9.gz
Diffstat (limited to 'XMonad')
| -rw-r--r-- | XMonad/Prompt.hs | 4 | ||||
| -rw-r--r-- | XMonad/Util/Font.hs | 2 |
2 files changed, 3 insertions, 3 deletions
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 |