summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-02-04 08:59:46 +0100
committerAnton Khirnov <wyskas@gmail.com>2010-02-04 08:59:46 +0100
commit96397e36d90e2a3cd8af7f1c07db0760d76d8181 (patch)
treeb104531ad34e96dcf9c0cd897718a64697de6755
parent4b9f85b09e293d1de6bb88f4b3575a937ac547d6 (diff)
add variables for tray/clock height
change tray height to 24 pixels
-rw-r--r--config28
-rw-r--r--initvars.config5
2 files changed, 19 insertions, 14 deletions
diff --git a/config b/config
index b9d89ee..af1aed0 100644
--- a/config
+++ b/config
@@ -11,11 +11,19 @@ ImagePath +:$[HOME]/gallery/
# Basic commands #
##################
-# pager_height = viewport_height - dclock - stalonetray
-PipeRead 'echo SetEnv fvwm_config_pagerheight $(($[vp.height] - 80 -64))'
+Read initvars.config
+Read functions.config
+Read colorset.config
+Read font.config
+Read bindings.config
+Read styles.config
+Read deco.config
+Read menu.config
+
# 96 pixels per page
PipeRead 'echo SetEnv fvwm_config_num_pages $(($[fvwm_config_pagerheight]/96))'
DesktopSize 1x$[fvwm_config_num_pages]
+
EdgeThickness 0
EdgeScroll 100 100
OpaqueMoveSize unlimited
@@ -24,14 +32,6 @@ IgnoreModifiers L25
EdgeResistance -1
EwmhBaseStruts 0 128 0 0
-Read initvars.config
-Read functions.config
-Read colorset.config
-Read font.config
-Read bindings.config
-Read styles.config
-Read deco.config
-Read menu.config
#####################
# STARTUP FUNCTIONS #
@@ -88,7 +88,7 @@ DestroyModuleConfig FvwmButtons: *
*FvwmButtons: Font $[ThemeTitleFont]
*FvwmButtons: Colorset 1
*FvwmButtons: Rows $[vp.height]
-*FvwmButtons: Columns 2
-*FvwmButtons: (2x$[fvwm_config_pagerheight], Swallow 'FvwmPager' 'FvwmPager')
-*FvwmButtons: (2x64, Swallow (NoClose, UseOld) stalonetray 'Exec exec stalonetray --no-shrink')
-*FvwmButtons: (2x64, Swallow '$[fvwm_config_clock]' 'Exec exec $[fvwm_config_clock]')
+*FvwmButtons: Columns 1
+*FvwmButtons: (1x$[fvwm_config_pagerheight], Swallow 'FvwmPager' 'FvwmPager')
+*FvwmButtons: (1x$[fvwm_config_trayheight], Swallow (NoClose, UseOld) stalonetray 'Exec exec stalonetray')
+*FvwmButtons: (1x$[fvwm_config_clockheight], Swallow '$[fvwm_config_clock]' 'Exec exec $[fvwm_config_clock]')
diff --git a/initvars.config b/initvars.config
index b2c8295..b0d3b39 100644
--- a/initvars.config
+++ b/initvars.config
@@ -9,6 +9,11 @@ SetEnv Y_offset 0
SetEnv height $[vp.height]
SetEnv width $[vp.width]
+# heights of panel apps
+SetEnv fvwm_config_trayheight 26
+SetEnv fvwm_config_clockheight 64
+PipeRead 'echo SetEnv fvwm_config_pagerheight $(($[vp.height] - 64 -26))'
+
##############################
## Set default applications ##
##############################