RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workspaces: fix twitchy scrolling on touchpads 

Previously, any and all scroll events were interpreted as reason to switch
workspaces. This resulted in twitchy behaviour, where the scrolling was
practically unusable.

Now, we pool all scroll values, and only scroll if the value is larger than the
new config option "smooth-scrolling-threshold". If this option is not set, the
behaviour is unchanged.
pull/381/head
Patrick Hilhorst 2019-06-11 16:19:11 +02:00
parent 1962caf144
commit ed4521d113
No known key found for this signature in database
GPG Key ID: 589BB0A8DAFEF2B2
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/sway/workspaces.hpp
View File

@ -41,6 +41,7 @@ class Workspaces : public IModule, public sigc::trackable {
util::JsonParser parser_;
bool scrolling_;
std::unordered_map<std::string, Gtk::Button> buttons_;
gdouble distance_scrolled_;
util::SleeperThread thread_;
Ipc ipc_;

25
src/modules/sway/workspaces.cpp
View File

@ -234,24 +234,37 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
}
switch (e->direction) {
case GDK_SCROLL_DOWN:
case GDK_SCROLL_RIGHT:
case GDK_SCROLL_RIGHT: {
name = getCycleWorkspace(it, false);
break;
}
case GDK_SCROLL_UP:
case GDK_SCROLL_LEFT:
case GDK_SCROLL_LEFT: {
name = getCycleWorkspace(it, true);
break;
case GDK_SCROLL_SMOOTH:
}
case GDK_SCROLL_SMOOTH: {
gdouble delta_x, delta_y;
gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent *>(e), &delta_x, &delta_y);
if (delta_y < 0) {
distance_scrolled_ += delta_y;
gdouble threshold = 0;
if (config_["smooth-scrolling-threshold"].isNumeric()) {
threshold = config_["smooth-scrolling-threshold"].asDouble();
}
if (distance_scrolled_ < -threshold) {
name = getCycleWorkspace(it, true);
} else if (delta_y > 0) {
} else if (distance_scrolled_ > threshold) {
name = getCycleWorkspace(it, false);
}
if(abs(distance_scrolled_) > threshold) {
distance_scrolled_ = 0;
}
break;
default:
}
default: {
break;
}
}
if (name.empty() || name == (*it)["name"].asString()) {
scrolling_ = false;