mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-06-13 14:33:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 286d241c43 into f4b9bdab65

Browse source
This commit is contained in:
st0rm-shad0w 2026-06-10 13:20:09 +02:00 • committed by GitHub
commit 5d081bcca4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 82 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/view.c
View file

@ -12,6 +12,7 @@
#include "buffer.h"
#include "common/box.h"
#include "common/list.h"
#include "common/macros.h"
#include "common/match.h"
#include "common/mem.h"
#include "common/string-helpers.h"
@ -609,6 +610,53 @@ view_resize_relative(struct view *view, int left, int right, int top, int bottom
view_set_untiled(view);
}
struct point {
int x, y;
};
/*
* Returns the total squared distance of the box's four corners from the
* output layout. A return value of 0 means the box is fully inside.
*/
static double
box_layout_overshoot(struct wlr_box *box)
{
struct wlr_output_layout *layout = server.output_layout;
double overshoot = 0;
struct point corners[] = { {
.x = box->x,
.y = box->y,
}, {
.x = box->x + box->width - 1,
.y = box->y,
}, {
.x = box->x,
.y = box->y + box->height - 1,
}, {
.x = box->x + box->width - 1,
.y = box->y + box->height - 1,
},
};
for (size_t i = 0; i < ARRAY_SIZE(corners); i++) {
struct point corner = corners[i];
/* We only care about corners outside the output-layout */
if (wlr_output_layout_output_at(layout, corner.x, corner.y)) {
continue;
}
double closest_x, closest_y;
wlr_output_layout_closest_point(layout, NULL, corner.x, corner.y,
&closest_x, &closest_y);
wlr_log(WLR_ERROR, "closest-x=%f; closest-y=%f", closest_x, closest_y);
double dx = corner.x - closest_x;
double dy = corner.y - closest_y;
overshoot += dx * dx + dy * dy;
}
return overshoot;
}
void
view_move_relative(struct view *view, int x, int y)
{
@ -621,6 +669,40 @@ view_move_relative(struct view *view, int x, int y)
view_set_untiled(view);
view_move_resize(view, view->natural_geometry);
}
/*
* Only proceed if movement brings the window closer to being fully
* inside the output layout. This allows a partially-outside window
* to be moved back inside, while still preventing a fully-inside
* window from being moved outside.
*/
struct border border = ssd_thickness(view);
struct wlr_box current_box = {
.x = view->pending.x - border.left,
.y = view->pending.y - border.top,
.width = view->pending.width + border.left + border.right,
.height = view->pending.height + border.top + border.bottom,
};
struct wlr_box dest = current_box;
dest.x += x;
dest.y += y;
double current_overshoot = box_layout_overshoot(&current_box);
double dest_overshoot = box_layout_overshoot(&dest);
if (dest_overshoot > 0 && dest_overshoot > current_overshoot) {
if (abs(x) > 1 || abs(y) > 1) {
/*
* It is reasonable to assume that users will specify
* big numbers (like 20) for the MoveRelative x or y
* value. When moving towards a layout outer edge, we
* would not want the window to stop a distance away
* from the edge, so recursively nudge it nearer until
* it is touching.
*/
view_move_relative(view, x / 2, y / 2);
}
return;
}
view_move(view, view->pending.x + x, view->pending.y + y);
}