Merge branch 'master' of /var/git/fvwmconf

diff --git a/artemis/config b/artemis/config
index 9c89a6cba57f8fb073b66871758d562a043737b0..954d0bf44047d004b7de39a2390696190a86123a 100644 (file)
--- a/artemis/config
+++ b/artemis/config
@@ -13,7 +13,6 @@ Read common/wallpaper
 Read common/panels
 Read common/modifier
 
-
 # Bindings for the modifier key
 Mouse 1 WFT 4 Mod_M1Func
 Mouse 2 WFT 4 Mod_M2Func
@@ -21,4 +20,4 @@ Mouse 3 WFT 4 Mod_M3Func
 
 # Use a smaller pager
 *FvwmPager: Geometry 200x26-0-0
-EwmhBaseStruts 0 0 0 30
+EwmhBaseStruts 0 0 32 30

diff --git a/common/panels b/common/panels
index 14426d19238785a5a9fec336472a0468e65e0f67..932061fc5c416f52711ddde5cf6f82dc85f8b61b 100644 (file)
--- a/common/panels
+++ b/common/panels
@@ -1,7 +1,8 @@
 # Top Panel
-Style "Xfce Panel" !Borders, !Title, Sticky, StaysOnTop, FixedPosition,FixedSize
-Style "Xfce Panel" NeverFocus, WindowListSkip, CirculateSkip
-Style "Xfce Panel" HilightColorset 1
+Style "trayer" !Title, Sticky, StaysOnTop
+Style "trayer" FixedPosition, FixedSize, !Handles
+style "trayer" NeverFocus, WindowListSkip, CirculateSkip
+Style "trayer" HilightColorset 1
 
 # Pager
 Colorset 14 fg gray, bg gray50
@@ -21,12 +22,12 @@ DestroyModuleConfig FvwmPager: *
 
 AddToFunc StartFunction
 + I Module FvwmPager *
++ I Exec exec trayer --align right --edge top --widthtype request --margin 6
 
 AddToFunc StartFunction_Screen0
-+ I Exec exec xfce4-panel
 + I Exec exec uim-toolbar-gtk-systray
 
 AddToFunc ExitFunction
 + I KillModule FvwmPager
-+ I PipeRead 'xfce4-panel --exit &>/dev/null'
 + I PipeRead 'kill `pgrep -P $PPID uim-toolbar-gtk` &>/dev/null'
++ I PipeRead 'kill `pgrep -P $PPID trayer` &>/dev/null'