X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=a5a62dd987aaea8a6129901d456938d1a2b868b5;hb=b0088891ec08706a92184aff508c2baefe488b54;hp=50aa5c38bf175e0779afff8e9fca4d844572d54a;hpb=9d9dc352d8af4d85c5e4984c72b45ad393fb65d6;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 50aa5c3..a5a62dd 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -427,16 +427,21 @@ void set_panel_properties(Panel *p)
 	XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
 
 	// Reserved space
+	unsigned int d1, screen_width, screen_height;
+	Window d2;
+	int d3;
+	XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
+	Monitor monitor = server.monitor[p->monitor];
 	long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (panel_horizontal) {
 		if (panel_position & TOP) {
-			struts[2] = p->area.height + p->marginy;
+			struts[2] = p->area.height + p->marginy + monitor.y;
 			struts[8] = p->posx;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[9] = p->posx + p->area.width - 1;
 		}
 		else {
-			struts[3] = p->area.height + p->marginy;
+			struts[3] = p->area.height + p->marginy + screen_height - monitor.y - monitor.height;
 			struts[10] = p->posx;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[11] = p->posx + p->area.width - 1;
@@ -444,13 +449,13 @@ void set_panel_properties(Panel *p)
 	}
 	else {
 		if (panel_position & LEFT) {
-			struts[0] = p->area.width + p->marginx;
+			struts[0] = p->area.width + p->marginx + monitor.x;
 			struts[4] = p->posy;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[5] = p->posy + p->area.height - 1;
 		}
 		else {
-			struts[1] = p->area.width + p->marginx;
+			struts[1] = p->area.width + p->marginx + screen_width - monitor.x - monitor.width;
 			struts[6] = p->posy;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[7] = p->posy + p->area.height - 1;