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

MoveToEdge: Snap to window edge

Browse source 
Add configurable option (enabled by default) to snap to next window
edge instead of screen edge.
This commit is contained in:
Axel Burri 2023-08-05 23:58:40 +02:00 • committed by Johan Malm
parent 1d72a08916
commit 08cff6edcf
3 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/view.h
View file

@ -370,7 +370,7 @@ void view_move_to_workspace(struct view *view, struct workspace *workspace);
void view_set_decorations(struct view *view, bool decorations);
void view_toggle_fullscreen(struct view *view);
void view_adjust_for_layout_change(struct view *view);
void view_move_to_edge(struct view *view, enum view_edge direction);
void view_move_to_edge(struct view *view, enum view_edge direction, bool snap_to_windows);
void view_snap_to_edge(struct view *view, enum view_edge direction, bool store_natural_geometry);
void view_snap_to_region(struct view *view, struct region *region, bool store_natural_geometry);

8
src/action.c
View file

@ -266,6 +266,11 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
}
break;
case ACTION_TYPE_MOVE_TO_EDGE:
if (!strcasecmp(argument, "snapWindows")) {
action_arg_add_bool(action, argument, parse_bool(content, true));
goto cleanup;
}
/* Falls through */
case ACTION_TYPE_SNAP_TO_EDGE:
if (!strcmp(argument, "direction")) {
enum view_edge edge = view_edge_parse(content);
@ -638,7 +643,8 @@ actions_run(struct view *activator, struct server *server,
if (view) {
/* Config parsing makes sure that direction is a valid direction */
enum view_edge edge = action_get_int(action, "direction", 0);
view_move_to_edge(view, edge);
bool snap_to_windows = action_get_bool(action, "snapWindows", true);
view_move_to_edge(view, edge, snap_to_windows);
}
break;
case ACTION_TYPE_SNAP_TO_EDGE:

43
src/view.c
View file

@ -9,6 +9,7 @@
#include "menu/menu.h"
#include "regions.h"
#include "resize_indicator.h"
#include "snap.h"
#include "ssd.h"
#include "view.h"
#include "window-rules.h"
@ -1127,50 +1128,38 @@ view_on_output_destroy(struct view *view)
}
void
view_move_to_edge(struct view *view, enum view_edge edge)
view_move_to_edge(struct view *view, enum view_edge direction, bool snap_to_windows)
{
assert(view);
struct output *output = view->output;
if (!output_is_usable(output)) {
if (!output_is_usable(view->output)) {
wlr_log(WLR_ERROR, "view has no output, not moving to edge");
return;
}
struct border margin = ssd_get_margin(view->ssd);
struct wlr_box usable = output_usable_area_in_layout_coords(output);
if (usable.height == output->wlr_output->height
&& output->wlr_output->scale != 1) {
usable.height /= output->wlr_output->scale;
}
if (usable.width == output->wlr_output->width
&& output->wlr_output->scale != 1) {
usable.width /= output->wlr_output->scale;
}
int x = 0, y = 0;
switch (edge) {
int dx = 0, dy = 0;
if (snap_to_windows) {
snap_vector_to_next_edge(view, direction, &dx, &dy);
} else {
struct border distance = snap_get_max_distance(view);
switch (direction) {
case VIEW_EDGE_LEFT:
x = usable.x + margin.left + rc.gap;
y = view->pending.y;
dx = distance.left;
break;
case VIEW_EDGE_UP:
x = view->pending.x;
y = usable.y + margin.top + rc.gap;
dy = distance.top;
break;
case VIEW_EDGE_RIGHT:
x = usable.x + usable.width - view->pending.width
- margin.right - rc.gap;
y = view->pending.y;
dx = distance.right;
break;
case VIEW_EDGE_DOWN:
x = view->pending.x;
y = usable.y + usable.height - view->pending.height
- margin.bottom - rc.gap;
dy = distance.bottom;
break;
default:
return;
}
view_move(view, x, y);
}
view_move(view, view->pending.x + dx, view->pending.y + dy);
}
enum view_edge