Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxListBox mouse wheel scrolling with GTK3

Browse Source 
Allow default handling for GDK_SCROLL_SMOOTH when we don't handle it. Closes #17097

(cherry picked from commit bf6f3e35e8)
This commit is contained in:
Paul Cornett
2015-08-09 20:58:20 -07:00
parent 3e7579d733
commit 20448fbcd3
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/window.cpp
View File

@@ -1662,7 +1662,7 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
static void AdjustRangeValue(GtkRange* range, double step) static void AdjustRangeValue(GtkRange* range, double step)
{ {
if (range && gtk_widget_get_visible(GTK_WIDGET(range))) if (gtk_widget_get_visible(GTK_WIDGET(range)))
{ {
GtkAdjustment* adj = gtk_range_get_adjustment(range); GtkAdjustment* adj = gtk_range_get_adjustment(range);
double value = gtk_adjustment_get_value(adj); double value = gtk_adjustment_get_value(adj);
@@ -1726,21 +1726,30 @@ scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win)
delta_x = 0; delta_x = 0;
} }
} }
bool handled = false;
if (delta_x) if (delta_x)
{ {
event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
event.m_wheelRotation = int(event.m_wheelDelta * delta_x); event.m_wheelRotation = int(event.m_wheelDelta * delta_x);
if (!win->GTKProcessEvent(event)) handled = win->GTKProcessEvent(event);
if (!handled && range_h)
{
AdjustRangeValue(range_h, event.m_columnsPerAction * delta_x); AdjustRangeValue(range_h, event.m_columnsPerAction * delta_x);
handled = true;
}
} }
if (delta_y) if (delta_y)
{ {
event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
event.m_wheelRotation = int(event.m_wheelDelta * -delta_y); event.m_wheelRotation = int(event.m_wheelDelta * -delta_y);
if (!win->GTKProcessEvent(event)) handled = win->GTKProcessEvent(event);
if (!handled && range_v)
{
AdjustRangeValue(range_v, event.m_linesPerAction * delta_y); AdjustRangeValue(range_v, event.m_linesPerAction * delta_y);
handled = true;
}
} }
return true; return handled;
#endif // GTK_CHECK_VERSION(3,4,0) #endif // GTK_CHECK_VERSION(3,4,0)
} }
GtkRange *range; GtkRange *range;