mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve expandibility

Browse source
This commit is contained in:
ARDiDo 2021-10-23 22:31:39 -04:00 • committed by Johan Malm
parent e1c8b3c641
commit a24e17dea7
7 changed files with 67 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/view.c
View file

@ -16,8 +16,6 @@ view_set_activated(struct view *view, bool activated)
}
}
static void view_move_resistance(struct view *view, double *x, double *y);
void
view_move_resize(struct view *view, struct wlr_box geo)
{
@ -31,7 +29,6 @@ void
view_move(struct view *view, double x, double y)
{
if (view->impl->move) {
view_move_resistance(view, &x, &y);
view->impl->move(view, x, y);
}
}
@ -255,7 +252,7 @@ view_for_each_popup_surface(struct view *view,
}
}
static struct border
struct border
view_border(struct view *view)
{
struct border border = {
@ -426,55 +423,6 @@ view_snap_to_edge(struct view *view, const char *direction)
view_move_resize(view, dst);
}
static void
view_move_resistance(struct view *view, double *x, double *y)
{
struct wlr_box mgeom;
struct output *output;
struct border border = view_border(view);
int l, r, t, b; /* The edges of the current view */
int tl, tr, tt, tb; /* The desired edges */
int ml, mr, mt, mb; /* The edges of the Monitor */
if (!rc.strength) {
return;
}
output = view_output(view);
if (!output) {
return;
}
l = view->x - border.left - rc.gap;
t = view->y - border.top - rc.gap;
r = view->x + view->w + border.right + rc.gap;
b = view->y + view->h + border.bottom + rc.gap;
tl = *x - border.left - rc.gap;
tt = *y - border.top - rc.gap;
tr = *x + view->w + border.right + rc.gap;
tb = *y + view->h + border.bottom + rc.gap;
mgeom = output_usable_area_in_layout_coords(output);
ml = mgeom.x;
mt = mgeom.y;
mr = mgeom.x + mgeom.width;
mb = mgeom.y + mgeom.height;
if (l >= ml && tl < ml && tl >= ml - rc.strength) {
*x = ml + border.left + rc.gap;
} else if (r <= mr && tr > mr && tr <= mr + rc.strength) {
*x = mr - view->w - border.right - rc.gap;
}
if (t >= mt && tt < mt && tt >= mt - rc.strength) {
*y = mt + border.top + rc.gap;
} else if (b <= mb && tb > mb && tb <= mb + rc.strength) {
*y = mb - view->h - border.bottom - rc.gap;
}
}
const char *
view_get_string_prop(struct view *view, const char *prop)
{