M
src/button/button.c
→
src/button/button.c
@@ -536,6 +536,7 @@ break;
}
if (command) {
int aligned_x, aligned_y, aligned_x1, aligned_y1, aligned_x2, aligned_y2;
+ int panel_x1, panel_x2, panel_y1, panel_y2;
if (panel_horizontal) {
if (area_is_first(button))
aligned_x1 = panel->posx;
@@ -560,6 +561,10 @@ else
aligned_y = panel->posy + panel->area.height;
aligned_y1 = aligned_y2 = aligned_y;
+
+ panel_x1 = panel->posx;
+ panel_x2 = panel->posx + panel->area.width;
+ panel_y1 = panel_y2 = aligned_y;
} else {
if (area_is_first(button))
aligned_y1 = panel->posy;
@@ -571,18 +576,23 @@ aligned_y2 = panel->posy + panel->area.height;
else
aligned_y2 = panel->posy + button->area.posy + button->area.height;
- if (panel_position & RIGHT)
- aligned_x = panel->posx;
- else
- aligned_x = panel->posx + panel->area.width;
-
- aligned_x1 = aligned_x2 = aligned_x;
if (area_is_first(button))
aligned_y = aligned_y1;
else if (area_is_last(button))
aligned_y = aligned_y2;
else
aligned_y = aligned_y1;
+
+ if (panel_position & RIGHT)
+ aligned_x = panel->posx;
+ else
+ aligned_x = panel->posx + panel->area.width;
+
+ aligned_x1 = aligned_x2 = aligned_x;
+
+ panel_x1 = panel_x2 = aligned_x;
+ panel_y1 = panel->posy;
+ panel_y2 = panel->posy + panel->area.height;
}
char *full_cmd = g_strdup_printf("export BUTTON_X=%d;"
@@ -595,6 +605,10 @@ "export BUTTON_ALIGNED_X1=%d;"
"export BUTTON_ALIGNED_Y1=%d;"
"export BUTTON_ALIGNED_X2=%d;"
"export BUTTON_ALIGNED_Y2=%d;"
+ "export BUTTON_PANEL_X1=%d;"
+ "export BUTTON_PANEL_Y1=%d;"
+ "export BUTTON_PANEL_X2=%d;"
+ "export BUTTON_PANEL_Y2=%d;"
"%s",
x,
y,
@@ -606,6 +620,10 @@ aligned_x1,
aligned_y1,
aligned_x2,
aligned_y2,
+ panel_x1,
+ panel_y1,
+ panel_x2,
+ panel_y2,
command);
pid_t pid = fork();
if (pid < 0) {