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

Go back to using a fixed value of 3 for lines/columns per action for mouse wheel event.

Browse Source 
The native value is too large. Reverts the effect of r74805. Closes #15527


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-10-01 16:33:30 +00:00
parent 4b263e5ef3
commit afab8b85c4
1 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
src/gtk/window.cpp
View File

@@ -1614,112 +1614,122 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
// "scroll_event" (mouse wheel event) // "scroll_event" (mouse wheel event)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Compute lines/columns per action the same way as private GTK+ function static void AdjustRangeValue(GtkRange* range, double step)
// _gtk_range_get_wheel_delta()
static inline int GetWheelScrollActionDelta(GtkRange* range)
{ {
int delta = 3; if (range && gtk_widget_get_visible(GTK_WIDGET(range)))
if (range)
{ {
GtkAdjustment* adj = gtk_range_get_adjustment(range); GtkAdjustment* adj = gtk_range_get_adjustment(range);
const double page_size = gtk_adjustment_get_page_size(adj); double value = gtk_adjustment_get_value(adj);
delta = wxRound(pow(page_size, 2.0 / 3.0)); value += step * gtk_adjustment_get_step_increment(adj);
gtk_range_set_value(range, value);
} }
return delta;
} }
static gboolean static gboolean
window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win)
{ {
wxMouseEvent event(wxEVT_MOUSEWHEEL); wxMouseEvent event(wxEVT_MOUSEWHEEL);
InitMouseEvent(win, event, gdk_event); InitMouseEvent(win, event, gdk_event);
event.m_wheelDelta = 120; event.m_wheelDelta = 120;
event.m_linesPerAction = 3;
event.m_columnsPerAction = 3;
#if GTK_CHECK_VERSION(3,4,0) GtkRange* range_h = win->m_scrollBar[wxWindow::ScrollDir_Horz];
if (gdk_event->direction == GDK_SCROLL_SMOOTH) GtkRange* range_v = win->m_scrollBar[wxWindow::ScrollDir_Vert];
const bool is_range_h = (void*)widget == range_h;
const bool is_range_v = (void*)widget == range_v;
GdkScrollDirection direction = gdk_event->direction;
switch (direction)
{ {
bool processed_x = false; case GDK_SCROLL_UP:
if (gdk_event->delta_x) if (is_range_h)
{ direction = GDK_SCROLL_LEFT;
event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; break;
event.m_wheelRotation = int(event.m_wheelDelta * gdk_event->delta_x); case GDK_SCROLL_DOWN:
GtkRange* range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; if (is_range_h)
event.m_linesPerAction = GetWheelScrollActionDelta(range); direction = GDK_SCROLL_RIGHT;
event.m_columnsPerAction = event.m_linesPerAction; break;
processed_x = win->GTKProcessEvent(event); case GDK_SCROLL_LEFT:
} if (is_range_v)
bool processed_y = false; direction = GDK_SCROLL_UP;
if (gdk_event->delta_y) break;
{ case GDK_SCROLL_RIGHT:
event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; if (is_range_v)
event.m_wheelRotation = int(event.m_wheelDelta * -gdk_event->delta_y); direction = GDK_SCROLL_DOWN;
GtkRange* range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; break;
event.m_linesPerAction = GetWheelScrollActionDelta(range); default:
event.m_columnsPerAction = event.m_linesPerAction; break;
processed_y = win->GTKProcessEvent(event); #if GTK_CHECK_VERSION(3,4,0)
} case GDK_SCROLL_SMOOTH:
return processed_x || processed_y; double delta_x = gdk_event->delta_x;
} double delta_y = gdk_event->delta_y;
if (delta_x == 0)
{
if (is_range_h)
{
delta_x = delta_y;
delta_y = 0;
}
}
else if (delta_y == 0)
{
if (is_range_v)
{
delta_y = delta_x;
delta_x = 0;
}
}
if (delta_x)
{
event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
event.m_wheelRotation = int(event.m_wheelDelta * delta_x);
if (!win->GTKProcessEvent(event))
AdjustRangeValue(range_h, event.m_columnsPerAction * delta_x);
}
if (delta_y)
{
event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
event.m_wheelRotation = int(event.m_wheelDelta * -delta_y);
if (!win->GTKProcessEvent(event))
AdjustRangeValue(range_v, event.m_linesPerAction * delta_y);
}
return true;
#endif // GTK_CHECK_VERSION(3,4,0) #endif // GTK_CHECK_VERSION(3,4,0)
}
GtkRange *range; GtkRange *range;
switch (gdk_event->direction) double step;
switch (direction)
{ {
case GDK_SCROLL_UP: case GDK_SCROLL_UP:
case GDK_SCROLL_DOWN: case GDK_SCROLL_DOWN:
range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; range = range_v;
event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL; event.m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
step = event.m_linesPerAction;
break; break;
case GDK_SCROLL_LEFT: case GDK_SCROLL_LEFT:
case GDK_SCROLL_RIGHT: case GDK_SCROLL_RIGHT:
range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; range = range_h;
event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; event.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL;
step = event.m_columnsPerAction;
break; break;
default: default:
return false; return false;
} }
event.m_wheelRotation = event.m_wheelDelta; event.m_wheelRotation = event.m_wheelDelta;
if (gdk_event->direction == GDK_SCROLL_DOWN || if (direction == GDK_SCROLL_DOWN || direction == GDK_SCROLL_LEFT)
gdk_event->direction == GDK_SCROLL_LEFT)
{
event.m_wheelRotation = -event.m_wheelRotation; event.m_wheelRotation = -event.m_wheelRotation;
}
event.m_linesPerAction = GetWheelScrollActionDelta(range);
event.m_columnsPerAction = event.m_linesPerAction;
return win->GTKProcessEvent(event); if (!win->GTKProcessEvent(event))
}
#if GTK_CHECK_VERSION(3,4,0)
static gboolean
hscrollbar_scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win)
{
GdkEventScroll event2;
if (gdk_event->direction == GDK_SCROLL_SMOOTH && gdk_event->delta_x == 0)
{ {
memcpy(&event2, gdk_event, sizeof(event2)); if (direction == GDK_SCROLL_UP || direction == GDK_SCROLL_LEFT)
event2.delta_x = event2.delta_y; step = -step;
event2.delta_y = 0; AdjustRangeValue(range, step);
gdk_event = &event2;
} }
return window_scroll_event(widget, gdk_event, win);
}
static gboolean return true;
vscrollbar_scroll_event(GtkWidget* widget, GdkEventScroll* gdk_event, wxWindow* win)
{
GdkEventScroll event2;
if (gdk_event->direction == GDK_SCROLL_SMOOTH && gdk_event->delta_y == 0)
{
memcpy(&event2, gdk_event, sizeof(event2));
event2.delta_y = event2.delta_x;
event2.delta_x = 0;
gdk_event = &event2;
}
return window_scroll_event(widget, gdk_event, win);
} }
#endif // GTK_CHECK_VERSION(3,4,0)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "popup-menu" // "popup-menu"
@@ -2647,23 +2657,13 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
g_signal_connect (widget, "motion_notify_event", g_signal_connect (widget, "motion_notify_event",
G_CALLBACK (gtk_window_motion_notify_callback), this); G_CALLBACK (gtk_window_motion_notify_callback), this);
g_signal_connect (widget, "scroll_event", g_signal_connect(widget, "scroll_event", G_CALLBACK(scroll_event), this);
G_CALLBACK (window_scroll_event), this); GtkRange* range = m_scrollBar[ScrollDir_Horz];
for (int i = 0; i < 2; i++) if (range)
{ g_signal_connect(range, "scroll_event", G_CALLBACK(scroll_event), this);
GtkRange* range = m_scrollBar[i]; range = m_scrollBar[ScrollDir_Vert];
if (range) if (range)
{ g_signal_connect(range, "scroll_event", G_CALLBACK(scroll_event), this);
#if GTK_CHECK_VERSION(3,4,0)
GCallback cb = GCallback(i == ScrollDir_Horz
? hscrollbar_scroll_event
: vscrollbar_scroll_event);
#else
GCallback cb = GCallback(window_scroll_event);
#endif
g_signal_connect(range, "scroll_event", cb, this);
}
}
g_signal_connect (widget, "popup_menu", g_signal_connect (widget, "popup_menu",
G_CALLBACK (wxgtk_window_popup_menu_callback), this); G_CALLBACK (wxgtk_window_popup_menu_callback), this);