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

Rename <snapping><dragResistance> to <resistance><unSnapThreshold>

Browse source 
As we already have <resistance><{screen,window}EdgeStrength>,
<resistance> will be a better place for this setting.
This commit is contained in:
tokyo4j 2024-08-08 09:19:52 +09:00 • committed by Hiroaki Yamamoto
parent dc387f7765
commit 670cc0f511
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/config/rcxml.c
View file

@ -965,6 +965,8 @@ entry(xmlNode *node, char *nodename, char *content)
rc.screen_edge_strength = atoi(content);
} else if (!strcasecmp(nodename, "windowEdgeStrength.resistance")) {
rc.window_edge_strength = atoi(content);
} else if (!strcasecmp(nodename, "unSnapThreshold.resistance")) {
rc.unsnap_threshold = atoi(content);
} else if (!strcasecmp(nodename, "range.snapping")) {
rc.snap_edge_range = atoi(content);
} else if (!strcasecmp(nodename, "enabled.overlay.snapping")) {
@ -987,8 +989,6 @@ entry(xmlNode *node, char *nodename, char *content)
} else {
wlr_log(WLR_ERROR, "ignoring invalid value for notifyClient");
}
} else if (!strcasecmp(nodename, "dragResistance.snapping")) {
rc.snap_drag_resistance = atoi(content);
/* <windowSwitcher show="" preview="" outlines="" /> */
} else if (!strcasecmp(nodename, "show.windowSwitcher")) {
@ -1289,6 +1289,7 @@ rcxml_init(void)
rc.kb_layout_per_window = false;
rc.screen_edge_strength = 20;
rc.window_edge_strength = 20;
rc.unsnap_threshold = 20;
rc.snap_edge_range = 1;
rc.snap_overlay_enabled = true;
@ -1296,7 +1297,6 @@ rcxml_init(void)
rc.snap_overlay_delay_outer = 500;
rc.snap_top_maximize = true;
rc.snap_tiling_events_mode = LAB_TILING_EVENTS_ALWAYS;
rc.snap_drag_resistance = 20;
rc.window_switcher.show = true;
rc.window_switcher.preview = true;

2
src/input/cursor.c
View file

@ -236,7 +236,7 @@ process_cursor_move(struct server *server, uint32_t time)
/*
* Un-tile the view when interactive move is delayed and the distance
* of cursor movement exceeds <snapping><dragResistance>.
* of cursor movement exceeds <resistance><unSnapThreshold>.
*/
if (server->move_pending && !interactive_move_tiled_view_to(
server, server->grabbed_view, &server->grab_box)) {

8
src/interactive.c
View file

@ -38,7 +38,7 @@ interactive_move_tiled_view_to(struct server *server, struct view *view,
{
assert(!view_is_floating(view));
int resistance = rc.snap_drag_resistance;
int threshold = rc.unsnap_threshold;
if (server->input_mode == LAB_INPUT_STATE_MOVE) {
/* When called from cursor motion handler */
@ -46,12 +46,12 @@ interactive_move_tiled_view_to(struct server *server, struct view *view,
double dx = server->seat.cursor->x - server->grab_x;
double dy = server->seat.cursor->y - server->grab_y;
if (dx * dx + dy * dy < resistance * resistance) {
if (dx * dx + dy * dy < threshold * threshold) {
return false;
}
} else {
/* When called from interactive_begin() */
if (resistance > 0) {
if (threshold > 0) {
return false;
}
}
@ -118,7 +118,7 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
}
/*
* If <snapping><dragResistance> is non-zero, the
* If <resistance><unSnapThreshold> is non-zero, the
* tiled/maximized view is un-tiled later in cursor
* motion handler.
*/