diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-11-18 14:05:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 14:05:03 -0500 |
| commit | b2c5248ad36a7a5cf342aa44a21a0956c025c43f (patch) | |
| tree | 265d4ea923f1329d1e7661c0f92a242337318d58 /sway/config | |
| parent | b87250425fe13149e41b346f15c5cf808f376438 (diff) | |
| parent | 70bc4c3ab6c408850543d827f788ef310fdb269c (diff) | |
Merge pull request #3018 from sxmichaels/add-scroll-factor
Add scroll factor input command.
Diffstat (limited to 'sway/config')
| -rw-r--r-- | sway/config/input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c index 794d5194..d5d2d90b 100644 --- a/sway/config/input.c +++ b/sway/config/input.c @@ -29,6 +29,7 @@ struct input_config *new_input_config(const char* identifier) { input->natural_scroll = INT_MIN; input->accel_profile = INT_MIN; input->pointer_accel = FLT_MIN; + input->scroll_factor = FLT_MIN; input->scroll_button = INT_MIN; input->scroll_method = INT_MIN; input->left_handed = INT_MIN; @@ -68,6 +69,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { if (src->pointer_accel != FLT_MIN) { dst->pointer_accel = src->pointer_accel; } + if (src->scroll_factor != FLT_MIN) { + dst->scroll_factor = src->scroll_factor; + } if (src->repeat_delay != INT_MIN) { dst->repeat_delay = src->repeat_delay; } |