blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix xdg-positioner left constrain bug

This commit is contained in:
Tony Crisci 2018-03-28 12:12:00 -04:00
parent 738f5e3344
commit e2c4e1ef54
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rootston/xdg_shell_v6.c
View File

@ -94,21 +94,21 @@ static void popup_constraint_offset(struct roots_xdg_popup_v6 *popup,
assert(output); assert(output);
struct wlr_box *output_box = wlr_output_layout_get_box(layout, output); struct wlr_box *output_box = wlr_output_layout_get_box(layout, output);
bool x_constrained = popup_lx <= output_box->x ||
popup_lx + popup_width >= output_box->x + output_box->width;
bool y_constrained = popup_ly <= output_box->y ||
popup_ly + popup_height >= output_box->y + output_box->height;
*offset_x = *offset_y = 0; *offset_x = *offset_y = 0;
double popup_ox = popup_lx - output_box->x; double popup_ox = popup_lx - output_box->x;
double popup_oy = popup_ly - output_box->y; double popup_oy = popup_ly - output_box->y;
if (x_constrained) { if (popup_lx < output_box->x) {
*offset_x = output_box->x - popup_lx;
} else if (popup_lx + popup_width > output_box->x + output_box->width) {
*offset_x = popup_width - (output_box->width - popup_ox); *offset_x = popup_width - (output_box->width - popup_ox);
} }
if (y_constrained) { if (popup_ly < output_box->y) {
*offset_y = output_box->y - popup_ly;
} else if (popup_ly + popup_height > output_box->y + output_box->height) {
*offset_y = popup_height - (output_box->height - popup_oy); *offset_y = popup_height - (output_box->height - popup_oy);
} }
} }
@ -161,10 +161,10 @@ static bool popup_unconstrain_slide(struct roots_xdg_popup_v6 *popup) {
} }
if (offset_x) { if (offset_x) {
popup->wlr_popup->geometry.x -= offset_x; popup->wlr_popup->geometry.x += offset_x;
} }
if (offset_y) { if (offset_y) {
popup->wlr_popup->geometry.y -= abs(offset_y); popup->wlr_popup->geometry.y += offset_y;
} }
popup_constraint_offset(popup, &offset_y, &offset_y); popup_constraint_offset(popup, &offset_y, &offset_y);