mirror of
https://github.com/labwc/labwc.git
synced 2026-04-12 08:21:13 -04:00
[fixup] timeout -> delay
This commit is contained in:
parent
776b84b792
commit
f38a9077ae
3 changed files with 14 additions and 14 deletions
|
|
@ -125,8 +125,8 @@ struct rcxml {
|
|||
|
||||
/* window snapping */
|
||||
int snap_edge_range;
|
||||
int snap_preview_interior_timeout;
|
||||
int snap_preview_exterior_timeout;
|
||||
int snap_preview_delay_interior;
|
||||
int snap_preview_delay_exterior;
|
||||
bool snap_top_maximize;
|
||||
enum tiling_events_mode snap_tiling_events_mode;
|
||||
|
||||
|
|
|
|||
|
|
@ -912,18 +912,18 @@ entry(xmlNode *node, char *nodename, char *content)
|
|||
rc.window_edge_strength = atoi(content);
|
||||
} else if (!strcasecmp(nodename, "range.snapping")) {
|
||||
rc.snap_edge_range = atoi(content);
|
||||
} else if (!strcasecmp(nodename, "edgeType.previewTimeout.snapping")) {
|
||||
} else if (!strcasecmp(nodename, "edgeType.previewDelay.snapping")) {
|
||||
if (!strcasecmp(content, "interior")) {
|
||||
edge_type = EDGE_TYPE_INTERIOR;
|
||||
} else if (!strcasecmp(content, "exterior")) {
|
||||
edge_type = EDGE_TYPE_EXTERIOR;
|
||||
}
|
||||
} else if (!strcasecmp(nodename, "previewTimeout.snapping")) {
|
||||
} else if (!strcasecmp(nodename, "previewDelay.snapping")) {
|
||||
if (edge_type & EDGE_TYPE_INTERIOR) {
|
||||
rc.snap_preview_interior_timeout = atoi(content);
|
||||
rc.snap_preview_delay_interior = atoi(content);
|
||||
}
|
||||
if (edge_type & EDGE_TYPE_EXTERIOR) {
|
||||
rc.snap_preview_exterior_timeout = atoi(content);
|
||||
rc.snap_preview_delay_exterior = atoi(content);
|
||||
}
|
||||
} else if (!strcasecmp(nodename, "topMaximize.snapping")) {
|
||||
set_bool(content, &rc.snap_top_maximize);
|
||||
|
|
@ -1202,8 +1202,8 @@ rcxml_init(void)
|
|||
rc.window_edge_strength = 20;
|
||||
|
||||
rc.snap_edge_range = 1;
|
||||
rc.snap_preview_interior_timeout = 500;
|
||||
rc.snap_preview_exterior_timeout = 500;
|
||||
rc.snap_preview_delay_interior = 500;
|
||||
rc.snap_preview_delay_exterior = 500;
|
||||
rc.snap_top_maximize = true;
|
||||
rc.snap_tiling_events_mode = LAB_TILING_EVENTS_ALWAYS;
|
||||
|
||||
|
|
|
|||
|
|
@ -157,21 +157,21 @@ show_edge_overlay(struct seat *seat, enum view_edge edge,
|
|||
seat->overlay.active.edge = edge;
|
||||
seat->overlay.active.output = output;
|
||||
|
||||
int timeout;
|
||||
int delay;
|
||||
if (edge_has_adjacent_output_from_cursor(seat, output, edge)) {
|
||||
timeout = rc.snap_preview_interior_timeout;
|
||||
delay = rc.snap_preview_delay_interior;
|
||||
} else {
|
||||
timeout = rc.snap_preview_exterior_timeout;
|
||||
delay = rc.snap_preview_delay_exterior;
|
||||
}
|
||||
|
||||
if (timeout > 0) {
|
||||
if (delay > 0) {
|
||||
if (!seat->overlay.timer) {
|
||||
seat->overlay.timer = wl_event_loop_add_timer(
|
||||
seat->server->wl_event_loop,
|
||||
handle_edge_overlay_timeout, seat);
|
||||
}
|
||||
/* Show overlay <previewTimeout>ms later */
|
||||
wl_event_source_timer_update(seat->overlay.timer, timeout);
|
||||
/* Show overlay <snapping><previewDelay>ms later */
|
||||
wl_event_source_timer_update(seat->overlay.timer, delay);
|
||||
} else {
|
||||
/* Show overlay now */
|
||||
struct wlr_box box = get_edge_snap_box(seat->overlay.active.edge,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue