From bc9f8e1fbc7e117ec5368d2d74742cdb2c5f22f7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 19 Jul 2011 12:49:05 +0200
Subject: Some minor adjustments

---
 lib/Phi/Widgets/Systray.hs | 9 ++++-----
 src/Phi.hs                 | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Phi/Widgets/Systray.hs b/lib/Phi/Widgets/Systray.hs
index e11e58d..0d14f0e 100644
--- a/lib/Phi/Widgets/Systray.hs
+++ b/lib/Phi/Widgets/Systray.hs
@@ -61,7 +61,7 @@ instance WidgetClass Systray where
     return $ SystrayState phi (head . getScreens $ dispvar) 0 lastReset []
   
   minSize _ (SystrayState _ systrayScreen _ _ icons) height screen = case True of 
-    _ | screen == systrayScreen -> (length icons)*height
+    _ | screen == systrayScreen -> max 0 $ (length icons)*(height+2)-1
       | otherwise -> 0
 
   weight _ = 0
@@ -72,7 +72,7 @@ instance WidgetClass Systray where
       liftIO $ writeIORef lastResetRef reset
       Matrix _ _ _ _ dx dy <- getMatrix
       forM_ (zip [0..] icons) $ \(i, SystrayIconState midParent window) -> do
-        let x = round dx + i*h 
+        let x = round dx + i*(h+2)
             y = round dy
         sendMessage phi $ RenderIcon midParent window x y h h (lastReset /= reset)
         
@@ -115,16 +115,15 @@ systrayRunner phi dispvar = do
                         writeIORef errorWindowRef (ev_resourceid event:errorWindows)
                     
                     (_, x', y', w', h', _, _) <- getGeometry disp midParent
+                    (_, _, _, w'', h'', _, _) <- getGeometry disp window
                     let resize = (fromIntegral x) /= x' || (fromIntegral y) /= y' || (fromIntegral w) /= w' || (fromIntegral h) /= h'
+                                 || (fromIntegral w) /= w'' || (fromIntegral h) /= h''
                     
                     when resize $ do
                       moveResizeWindow disp midParent (fromIntegral x) (fromIntegral y) (fromIntegral w) (fromIntegral h)
                       resizeWindow disp window (fromIntegral w) (fromIntegral h)
                       sync disp False
                     
-                    clearArea disp midParent 0 0 (fromIntegral w) (fromIntegral h) True
-                    sync disp False
-                      
                     when (resize || reset) $ do
                       clearArea disp window 0 0 (fromIntegral w) (fromIntegral h) True
                       sync disp False
diff --git a/src/Phi.hs b/src/Phi.hs
index a842e4d..9597955 100644
--- a/src/Phi.hs
+++ b/src/Phi.hs
@@ -12,7 +12,7 @@ import Phi.Widgets.Systray
 
 main :: IO ()
 main = do
-  runPhi defaultXConfig defaultPanelConfig { panelPosition = Bottom }
+  runPhi defaultXConfig defaultPanelConfig { panelPosition = Top }
     [alphaBox 0.9 [theTaskbar, brightBorder [theSystray], brightBorder [theClock]]]
     where
       normalTaskBorder = BorderConfig (BorderWidth (-1) (-3) (-1) 7) 1 (BorderWidth 0 5 0 5) (0.9, 0.9, 0.9, 0.8) (0.45, 0.45, 0.45, 0.8) 5 0
-- 
cgit v1.2.3