From 5f7d8e9fcd070f30794f68f5b0b91b9d5ce7a974 Mon Sep 17 00:00:00 2001 From: gwern0 Date: Tue, 18 Sep 2007 18:29:50 +0200 Subject: XPrompt.hs: replace 'borderWidth' with 'borderPixel' borderWidth is already defined in Config.hs. Thus, if one attempted to use a prompt configuration different than defaultXPConfig, and one defined it in one's Config.hs where it should be, then the borderWidth field would cause a warning by -Wall, since borderWidth is already a name being used by XMonad at large. darcs-hash:20070918162950-f7719-63aede31072155fee70d3d01cb635636ff2a457c.gz --- XPrompt.hs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'XPrompt.hs') diff --git a/XPrompt.hs b/XPrompt.hs index f98cf30..e2ac85d 100644 --- a/XPrompt.hs +++ b/XPrompt.hs @@ -89,10 +89,10 @@ data XPConfig = XPC { font :: String -- ^ Font , bgColor :: String -- ^ Backgroud color , fgColor :: String -- ^ Font color - , fgHLight :: String -- ^ Font color of a highlighted completion entry - , bgHLight :: String -- ^ Backgroud color of a highlighted completion entry - , borderColor :: String -- ^ Border color - , borderWidth :: Dimension -- ^ Border width + , fgHLight :: String -- ^ Font color of a highlighted completion entry + , bgHLight :: String -- ^ Backgroud color of a highlighted completion entry + , borderColor :: String -- ^ Border color + , borderPixel :: Dimension -- ^ Border width , position :: XPPosition -- ^ Position: 'Top' or 'Bottom' , height :: Dimension -- ^ Window height , historySize :: Int -- ^ The number of history entries to be saved @@ -131,7 +131,7 @@ defaultXPConfig = , fgHLight = "#000000" , bgHLight = "#BBBBBB" , borderColor = "#FFFFFF" - , borderWidth = 1 + , borderPixel = 1 , position = Bottom , height = 18 , historySize = 256 @@ -378,7 +378,7 @@ drawWin = do w = win st wh = widthOfScreen scr ht = height c - bw = borderWidth c + bw = borderPixel c gc = gcon st fontStruc = fs st bgcolor <- io $ initColor d (bgColor c) @@ -488,7 +488,7 @@ drawComplWin w compl = do let c = config st d = dpy st scr = defaultScreenOfDisplay d - bw = borderWidth c + bw = borderPixel c gc = gcon st bgcolor <- io $ initColor d (bgColor c) fgcolor <- io $ initColor d (fgColor c) -- cgit v1.2.3