0001: Improve Snap... docuemntation. 0002: Improve EdgeMoveDelay documentation. 0003: Remove superfluous "#if 1".
Ciao Dominik ^_^ ^_^ -- Dominik Vogt
From bda6a6a423ac05b68e65fc850afba9de57c6e46c Mon Sep 17 00:00:00 2001 From: Dominik Vogt <dominik.v...@gmx.de> Date: Sun, 14 Nov 2021 23:30:49 +0100 Subject: [PATCH 1/4] Improve Snap... documentation. --- doc/fvwm3/fvwm3.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/fvwm3/fvwm3.adoc b/doc/fvwm3/fvwm3.adoc index 86d7a97d..9d362a7e 100644 --- a/doc/fvwm3/fvwm3.adoc +++ b/doc/fvwm3/fvwm3.adoc @@ -6193,15 +6193,15 @@ during an interactive move the window or icon comes within _proximity_ pixels of another the window or icon, it is moved to make the borders adjoin. The default of 0 means that no snapping happens. Calling this command without arguments turns off snap attraction and restores the -default behavior. Please refer also to the *SnapGrid* command. +default behavior. Please refer also to the _SnapGrid_ option. + -The second argument determined is optional and may be set to one of +The second argument optional and may be set to one of the five following values: With _All_ both icons and windows snap to other windows and other icons. _SameType_ lets windows snap only to windows, and icons snap only to icons. With _Windows_ windows snap only to other windows. Similarly with _Icons_ icons snap only to other icons. With _None_ no snapping takes place. This option can be useful -in conjunction with the following argument if you only want to snap +in conjunction with the thirs argument if you only want to snap against the screen edges. The default behavior is _All_. + The third and last optional argument may be set to one of the four @@ -6223,10 +6223,10 @@ location (top left corner) is coincident with the nearest grid point. The default _x-grid-size_ and _y-grid-size_ setting are both 1, which is effectively no grid all. -An interactive move with both *SnapGrid* and _SnapAttraction_ results +An interactive move with both _SnapGrid_ and _SnapAttraction_ results in the window being moved to be adjacent to the nearest window border (if within snap proximity) or grid position. The window moves the -shortest distance possible to satisfy both *SnapGrid* and +shortest distance possible to satisfy both _SnapGrid_ and _SnapAttraction_. Note that the x and y coordinates are not coupled. For example, a window may snap to another window on the x axis while snapping to a grid point on the y axis. Using this style without -- 2.30.2
From b5eb5f7ad5cde4682dbd6848dda9ea0bc2bb965e Mon Sep 17 00:00:00 2001 From: Dominik Vogt <dominik.v...@gmx.de> Date: Mon, 15 Nov 2021 01:23:44 +0100 Subject: [PATCH 2/4] Rephrase EdgeMoveDelay documentation. --- doc/fvwm3/fvwm3.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/fvwm3/fvwm3.adoc b/doc/fvwm3/fvwm3.adoc index 9d362a7e..5594fdab 100644 --- a/doc/fvwm3/fvwm3.adoc +++ b/doc/fvwm3/fvwm3.adoc @@ -6232,8 +6232,8 @@ For example, a window may snap to another window on the x axis while snapping to a grid point on the y axis. Using this style without arguments reinstates the default settings. -The styles _EdgeMoveDelay_ and _EdgeResizeDelay_ tells how hard it -should be to change the desktop viewport by moving or resizing a +The styles _EdgeMoveDelay_ and _EdgeResizeDelay_ define how hard it +is to change the desktop viewport by moving or resizing a window over the edge of the screen. The parameter tells how many milliseconds the pointer must spend on the screen edge before fvwm moves the viewport. The command *EdgeScroll* determines how far the -- 2.30.2
From 50c4557110651bbf78b24ed0a2a35ca4075a4ce8 Mon Sep 17 00:00:00 2001 From: Dominik Vogt <dominik.v...@gmx.de> Date: Sun, 14 Nov 2021 23:55:54 +0100 Subject: [PATCH 3/4] Remove "#if 1". --- fvwm/fvwm.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fvwm/fvwm.h b/fvwm/fvwm.h index 020de3bf..bdc04ee8 100644 --- a/fvwm/fvwm.h +++ b/fvwm/fvwm.h @@ -687,7 +687,6 @@ typedef struct window_style bool max_window_width_is_c; bool max_window_height_is_c; int shade_anim_steps; -#if 1 /*!!!*/ snap_attraction_t snap_attraction; /* snap grid size */ int snap_grid_x; @@ -696,7 +695,6 @@ typedef struct window_style int edge_delay_ms_resize; int edge_resistance_move; int edge_resistance_xinerama_move; -#endif icon_boxes *icon_boxes; float norm_placement_penalty; pl_penalty_struct pl_penalty; @@ -919,7 +917,6 @@ typedef struct FvwmWindow int max_window_height; int shade_anim_steps; unsigned char grabbed_buttons; -#if 1 /*!!!*/ snap_attraction_t snap_attraction; /* snap grid size */ int snap_grid_x; @@ -928,7 +925,6 @@ typedef struct FvwmWindow int edge_delay_ms_resize; int edge_resistance_move; int edge_resistance_xinerama_move; -#endif #define FM_NO_INPUT 0 #define FM_PASSIVE 1 -- 2.30.2
