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

[fixup] including the following...

Browse source 
1. Use `struct point corners[]` instead of double corners[4][2]

2. Use ARRAY_SIZE(corners)

3. Ignore any corners inside the output-layout area

4. Allow movement when dest_overshoot == current_overshoot so that
   movement along an output edge can take place.
This commit is contained in:
Johan Malm 2026-05-08 22:07:13 +01:00
parent 19ba61a834
commit 286d241c43
1 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/view.c
View file

@ -12,6 +12,7 @@
#include "buffer.h" #include "buffer.h"
#include "common/box.h" #include "common/box.h"
#include "common/list.h" #include "common/list.h"
#include "common/macros.h"
#include "common/match.h" #include "common/match.h"
#include "common/mem.h" #include "common/mem.h"
#include "common/string-helpers.h" #include "common/string-helpers.h"
@ -609,6 +610,10 @@ view_resize_relative(struct view *view, int left, int right, int top, int bottom
view_set_untiled(view); view_set_untiled(view);
} }
struct point {
int x, y;
};
/* /*
* Returns the total squared distance of the box's four corners from the * 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. * output layout. A return value of 0 means the box is fully inside.
@ -618,19 +623,35 @@ box_layout_overshoot(struct wlr_box *box)
{ {
struct wlr_output_layout *layout = server.output_layout; struct wlr_output_layout *layout = server.output_layout;
double overshoot = 0; double overshoot = 0;
double corners[4][2] = { struct point corners[] = { {
{box->x, box->y}, .x = box->x,
{box->x + box->width - 1, box->y}, .y = box->y,
{box->x, box->y + box->height - 1}, }, {
{box->x + box->width - 1, box->y + box->height - 1}, .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 (int i = 0; i < 4; i++) {
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; double closest_x, closest_y;
wlr_output_layout_closest_point(layout, NULL, wlr_output_layout_closest_point(layout, NULL, corner.x, corner.y,
corners[i][0], corners[i][1],
&closest_x, &closest_y); &closest_x, &closest_y);
double dx = corners[i][0] - closest_x; wlr_log(WLR_ERROR, "closest-x=%f; closest-y=%f", closest_x, closest_y);
double dy = corners[i][1] - closest_y; double dx = corner.x - closest_x;
double dy = corner.y - closest_y;
overshoot += dx * dx + dy * dy; overshoot += dx * dx + dy * dy;
} }
return overshoot; return overshoot;
@ -667,7 +688,7 @@ view_move_relative(struct view *view, int x, int y)
dest.y += y; dest.y += y;
double current_overshoot = box_layout_overshoot(&current_box); double current_overshoot = box_layout_overshoot(&current_box);
double dest_overshoot = box_layout_overshoot(&dest); double dest_overshoot = box_layout_overshoot(&dest);
if (dest_overshoot > 0 && dest_overshoot >= current_overshoot) { if (dest_overshoot > 0 && dest_overshoot > current_overshoot) {
if (abs(x) > 1 || abs(y) > 1) { if (abs(x) > 1 || abs(y) > 1) {
/* /*
* It is reasonable to assume that users will specify * It is reasonable to assume that users will specify