From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Sat, 12 Jun 2010 12:25:21 +0000 (+0000)
Subject: strut_policy=minimum possible even if autohide disabled
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=880f96997be8b3be10d609ed829abec96e5391b3;p=chaz%2Ftint2

strut_policy=minimum possible even if autohide disabled
---

diff --git a/src/config.c b/src/config.c
index 6233ecc..1175660 100644
--- a/src/config.c
+++ b/src/config.c
@@ -283,10 +283,10 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "panel_layer") == 0) {
 		if (strcmp(value, "bottom") == 0)
 			panel_layer = BOTTOM_LAYER;
-		else if (strcmp(value, "normal") == 0)
-			panel_layer = NORMAL_LAYER;
 		else if (strcmp(value, "top") == 0)
 			panel_layer = TOP_LAYER;
+		else
+			panel_layer = NORMAL_LAYER;
 	}
 
 	/* Battery */
diff --git a/src/panel.c b/src/panel.c
index 6c6a462..1c5fbd8 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -88,7 +88,7 @@ void default_panel()
 	panel_autohide_show_timeout = 0;
 	panel_autohide_hide_timeout = 0;
 	panel_autohide_height = 5;  // for vertical panels this is of course the width
-	panel_strut_policy = STRUT_MINIMUM;
+	panel_strut_policy = STRUT_FOLLOW_SIZE;
 	panel_dock = 0;  // default not in the dock
 	panel_layer = BOTTOM_LAYER;  // default is bottom layer
 	wm_menu = 0;
@@ -284,16 +284,15 @@ void init_panel_size_and_position(Panel *panel)
 		}
 	}
 
-	if (panel_autohide) {
-		int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
-		if (panel_horizontal) {
-			panel->hidden_width = panel->area.width;
-			panel->hidden_height = panel->area.height - diff;
-		}
-		else {
-			panel->hidden_width = panel->area.width - diff;
-			panel->hidden_height = panel->area.height;
-		}
+	// autohide or strut_policy=minimum
+	int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
+	if (panel_horizontal) {
+		panel->hidden_width = panel->area.width;
+		panel->hidden_height = panel->area.height - diff;
+	}
+	else {
+		panel->hidden_width = panel->area.width - diff;
+		panel->hidden_height = panel->area.height;
 	}
 	// printf("panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width, panel->area.height);
 }
@@ -417,7 +416,7 @@ void update_strut(Panel* p)
 	long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (panel_horizontal) {
 		int height = p->area.height + p->marginy;
-		if (panel_autohide && (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) )
+		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden))
 			height = p->hidden_height;
 		if (panel_position & TOP) {
 			struts[2] = height + monitor.y;
@@ -434,7 +433,7 @@ void update_strut(Panel* p)
 	}
 	else {
 		int width = p->area.width + p->marginx;
-		if (panel_autohide && (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) )
+		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden))
 			width = p->hidden_width;
 		if (panel_position & LEFT) {
 			struts[0] = width + monitor.x;