X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=f9593777d0c6bd1516c7dd1c07c3689991a5f396;hb=384247b181a3a7332d9e11b906685c4190da5fd1;hp=b99ffa56e576cb078c9cbfd440646615f8addc5e;hpb=857a47544272e432112157dc55694faf079b8c77;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index b99ffa5..f959377 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -182,8 +182,9 @@ void init_panel()
 			if (panel_items_order[k] == 'B')
 				init_battery_panel(p);
 #endif
-			if (panel_items_order[k] == 'S') {
+			if (panel_items_order[k] == 'S' && i==0) {
 				// TODO : check systray is only on 1 panel
+				// at the moment only on panel1[0] allowed
 				init_systray_panel(p);
 				refresh_systray = 1;
 			}
@@ -235,6 +236,8 @@ void init_panel_size_and_position(Panel *panel)
 			panel->area.width = (float)server.monitor[panel->monitor].width * panel->area.width / 100;
 		if (panel->pourcenty)
 			panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100;
+		if (panel->area.width + panel->marginx > server.monitor[panel->monitor].width)
+			panel->area.width = server.monitor[panel->monitor].width - panel->marginx;
 		if (panel->area.bg->border.rounded > panel->area.height/2) {
 			printf("panel_background_id rounded is too big... please fix your tint2rc\n");
 			g_array_append_val(backgrounds, *panel->area.bg);
@@ -252,6 +255,8 @@ void init_panel_size_and_position(Panel *panel)
 			panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100;
 		else
 			panel->area.width = old_panel_height;
+		if (panel->area.height + panel->marginy > server.monitor[panel->monitor].height)
+			panel->area.height = server.monitor[panel->monitor].height - panel->marginy;
 		if (panel->area.bg->border.rounded > panel->area.width/2) {
 			printf("panel_background_id rounded is too big... please fix your tint2rc\n");
 			g_array_append_val(backgrounds, *panel->area.bg);
@@ -397,8 +402,9 @@ void set_panel_items_order(Panel *p)
 		if (panel_items_order[k] == 'B') 
 			p->area.list = g_slist_append(p->area.list, &p->battery);
 #endif
-		if (panel_items_order[k] == 'S') {
+		if (panel_items_order[k] == 'S' && p == panel1) {
 			// TODO : check systray is only on 1 panel
+			// at the moment only on panel1[0] allowed
 			p->area.list = g_slist_append(p->area.list, &systray);
 		}
 		if (panel_items_order[k] == 'C')