From d72088aae409cd15658088a74efa818787f014e6 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Tue, 14 Sep 2010 01:38:50 +0200 Subject: Remove last excess definition of `fi' (fromIntegral) Ignore-this: 42d9282697573b361d763d980b816465 darcs-hash:20100913233850-1499c-20e07e9b380af55b7e1786630472a05996229c8c.gz --- XMonad/Prompt.hs | 3 +-- XMonad/Util/Font.hs | 1 + XMonad/Util/Image.hs | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index 946d0dc..d8133fd 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -71,7 +71,6 @@ import qualified XMonad.StackSet as W import XMonad.Util.Font import XMonad.Util.Types import XMonad.Util.XSelection (getSelection) -import XMonad.Util.XUtils (fi) import Codec.Binary.UTF8.String (decodeString) import Control.Applicative ((<$>)) @@ -922,4 +921,4 @@ historyNextMatching hm@(HistoryMatches ref) next = do -- historyUpMatching, historyDownMatching :: HistoryMatches -> XP () historyUpMatching hm = historyNextMatching hm W.focusDown' -historyDownMatching hm = historyNextMatching hm W.focusUp' \ No newline at end of file +historyDownMatching hm = historyNextMatching hm W.focusUp' diff --git a/XMonad/Util/Font.hs b/XMonad/Util/Font.hs index b08f021..d05b433 100644 --- a/XMonad/Util/Font.hs +++ b/XMonad/Util/Font.hs @@ -29,6 +29,7 @@ module XMonad.Util.Font , textExtentsXMF , printStringXMF , stringToPixel + , fi ) where import XMonad diff --git a/XMonad/Util/Image.hs b/XMonad/Util/Image.hs index 472586f..ff0ecdc 100644 --- a/XMonad/Util/Image.hs +++ b/XMonad/Util/Image.hs @@ -18,12 +18,10 @@ module XMonad.Util.Image Placement(..), iconPosition, drawIcon, - - fi, ) where import XMonad -import XMonad.Util.Font (stringToPixel) +import XMonad.Util.Font (stringToPixel,fi) -- | Placement of the icon in the title bar data Placement = OffsetLeft Int Int -- ^ An exact amount of pixels from the upper left corner @@ -87,8 +85,3 @@ drawIcon dpy drw gc fc bc x y icon = do io $ fillRectangle dpy drw gc x y (fi i_w) (fi i_h) io $ setForeground dpy gc fcolor io $ drawPoints dpy drw gc (movePoints x y (iconToPoints icon)) coordModeOrigin - - --- | Short-hand for 'fromIntegral' -fi :: (Integral a, Num b) => a -> b -fi = fromIntegral -- cgit v1.2.3