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

[wip] Add ToggleSnapToEdge

Browse source 
This allows to replace the usual maximize behavior that does not
respect gaps with SnapToEdge direction="center" which does respect
gaps. It can be bound to the SSD Maximize button and Title double
click handlers in rc.xml.

Missing:
- [ ] docs
- [ ] some enum for `<snapping topMaximize="yes|no">`
      like `yes|no|respect_gaps`

Ref: https://www.reddit.com/r/labwc/comments/1brvsj8/
This commit is contained in:
Consolatis 2024-03-31 04:52:30 +02:00
parent d68376f2ac
commit c2ddb1530d
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/view.h
View file

@ -461,6 +461,7 @@ void view_grow_to_edge(struct view *view, enum view_edge direction);
void view_shrink_to_edge(struct view *view, enum view_edge direction); void view_shrink_to_edge(struct view *view, enum view_edge direction);
void view_snap_to_edge(struct view *view, enum view_edge direction, void view_snap_to_edge(struct view *view, enum view_edge direction,
bool across_outputs, bool store_natural_geometry); bool across_outputs, bool store_natural_geometry);
void view_toggle_snap_to_edge(struct view *view, enum view_edge direction);
void view_snap_to_region(struct view *view, struct region *region, bool store_natural_geometry); void view_snap_to_region(struct view *view, struct region *region, bool store_natural_geometry);
void view_move_to_output(struct view *view, struct output *output); void view_move_to_output(struct view *view, struct output *output);

16
src/action.c
View file

@ -81,6 +81,7 @@ enum action_type {
ACTION_TYPE_TOGGLE_ALWAYS_ON_TOP, ACTION_TYPE_TOGGLE_ALWAYS_ON_TOP,
ACTION_TYPE_TOGGLE_ALWAYS_ON_BOTTOM, ACTION_TYPE_TOGGLE_ALWAYS_ON_BOTTOM,
ACTION_TYPE_TOGGLE_OMNIPRESENT, ACTION_TYPE_TOGGLE_OMNIPRESENT,
ACTION_TYPE_TOGGLE_SNAP_TO_EDGE,
ACTION_TYPE_FOCUS, ACTION_TYPE_FOCUS,
ACTION_TYPE_UNFOCUS, ACTION_TYPE_UNFOCUS,
ACTION_TYPE_ICONIFY, ACTION_TYPE_ICONIFY,
@ -134,6 +135,7 @@ const char *action_names[] = {
"ToggleAlwaysOnTop", "ToggleAlwaysOnTop",
"ToggleAlwaysOnBottom", "ToggleAlwaysOnBottom",
"ToggleOmnipresent", "ToggleOmnipresent",
"ToggleSnapToEdge",
"Focus", "Focus",
"Unfocus", "Unfocus",
"Iconify", "Iconify",
@ -304,10 +306,12 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
case ACTION_TYPE_SNAP_TO_EDGE: case ACTION_TYPE_SNAP_TO_EDGE:
case ACTION_TYPE_GROW_TO_EDGE: case ACTION_TYPE_GROW_TO_EDGE:
case ACTION_TYPE_SHRINK_TO_EDGE: case ACTION_TYPE_SHRINK_TO_EDGE:
case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
if (!strcmp(argument, "direction")) { if (!strcmp(argument, "direction")) {
enum view_edge edge = view_edge_parse(content); enum view_edge edge = view_edge_parse(content);
if ((edge == VIEW_EDGE_CENTER && action->type != ACTION_TYPE_SNAP_TO_EDGE) if (edge == VIEW_EDGE_INVALID || (edge == VIEW_EDGE_CENTER
|| edge == VIEW_EDGE_INVALID) { && action->type != ACTION_TYPE_SNAP_TO_EDGE
&& action->type != ACTION_TYPE_TOGGLE_SNAP_TO_EDGE)) {
wlr_log(WLR_ERROR, "Invalid argument for action %s: '%s' (%s)", wlr_log(WLR_ERROR, "Invalid argument for action %s: '%s' (%s)",
action_names[action->type], argument, content); action_names[action->type], argument, content);
} else { } else {
@ -495,6 +499,7 @@ action_is_valid(struct action *action)
case ACTION_TYPE_SNAP_TO_EDGE: case ACTION_TYPE_SNAP_TO_EDGE:
case ACTION_TYPE_GROW_TO_EDGE: case ACTION_TYPE_GROW_TO_EDGE:
case ACTION_TYPE_SHRINK_TO_EDGE: case ACTION_TYPE_SHRINK_TO_EDGE:
case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
arg_name = "direction"; arg_name = "direction";
arg_type = LAB_ACTION_ARG_INT; arg_type = LAB_ACTION_ARG_INT;
break; break;
@ -732,6 +737,13 @@ actions_run(struct view *activator, struct server *server,
/*store_natural_geometry*/ true); /*store_natural_geometry*/ true);
} }
break; break;
case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
if (view) {
/* Config parsing makes sure that direction is a valid direction */
enum view_edge edge = action_get_int(action, "direction", 0);
view_toggle_snap_to_edge(view, edge);
}
break;
case ACTION_TYPE_GROW_TO_EDGE: case ACTION_TYPE_GROW_TO_EDGE:
if (view) { if (view) {
/* Config parsing makes sure that direction is a valid direction */ /* Config parsing makes sure that direction is a valid direction */

14
src/view.c
View file

@ -1840,6 +1840,20 @@ view_edge_parse(const char *direction)
} }
} }
void
view_toggle_snap_to_edge(struct view *view, enum view_edge edge)
{
assert(view);
if (view->tiled != edge) {
view_snap_to_edge(view, edge, /*across_outputs*/ true,
/*store_natural_geometry*/ true);
} else {
view_restore_to(view, view->natural_geometry);
view_set_untiled(view);
}
}
void void
view_snap_to_edge(struct view *view, enum view_edge edge, view_snap_to_edge(struct view *view, enum view_edge edge,
bool across_outputs, bool store_natural_geometry) bool across_outputs, bool store_natural_geometry)