mirror of
				https://github.com/rad4day/Waybar.git
				synced 2025-10-31 16:02:43 +01:00 
			
		
		
		
	Merge pull request #2267 from korylprince/reverse-scrolling
Don't apply reverse scrolling to mice wheels
This commit is contained in:
		| @@ -99,6 +99,13 @@ bool AModule::handleToggle(GdkEventButton* const& e) { | |||||||
| AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) { | AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) { | ||||||
|   // only affects up/down |   // only affects up/down | ||||||
|   bool reverse = config_["reverse-scrolling"].asBool(); |   bool reverse = config_["reverse-scrolling"].asBool(); | ||||||
|  |   bool reverse_mouse = config_["reverse-mouse-scrolling"].asBool(); | ||||||
|  |  | ||||||
|  |   // ignore reverse-scrolling if event comes from a mouse wheel | ||||||
|  |   GdkDevice* device = gdk_event_get_source_device((GdkEvent *)e); | ||||||
|  |   if (device != NULL && gdk_device_get_source(device) == GDK_SOURCE_MOUSE) { | ||||||
|  |     reverse = reverse_mouse; | ||||||
|  |   } | ||||||
|  |  | ||||||
|   switch (e->direction) { |   switch (e->direction) { | ||||||
|     case GDK_SCROLL_UP: |     case GDK_SCROLL_UP: | ||||||
| @@ -121,9 +128,9 @@ AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) { | |||||||
|       } |       } | ||||||
|  |  | ||||||
|       if (distance_scrolled_y_ < -threshold) { |       if (distance_scrolled_y_ < -threshold) { | ||||||
|         dir = SCROLL_DIR::UP; |         dir = reverse ? SCROLL_DIR::DOWN : SCROLL_DIR::UP; | ||||||
|       } else if (distance_scrolled_y_ > threshold) { |       } else if (distance_scrolled_y_ > threshold) { | ||||||
|         dir = SCROLL_DIR::DOWN; |         dir = reverse ? SCROLL_DIR::UP : SCROLL_DIR::DOWN; | ||||||
|       } else if (distance_scrolled_x_ > threshold) { |       } else if (distance_scrolled_x_ > threshold) { | ||||||
|         dir = SCROLL_DIR::RIGHT; |         dir = SCROLL_DIR::RIGHT; | ||||||
|       } else if (distance_scrolled_x_ < -threshold) { |       } else if (distance_scrolled_x_ < -threshold) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Alexis Rouillard
					Alexis Rouillard