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

Avoid generating scroll event when our scrollbar is disabled by other software

Browse Source 
webkitgtk apparently manipulates our scrollbar GtkAdjustment directly, setting
all members to zero to disable it. Since we never do that, those values were
unexpected. This is a better fix for the problem papered over by 45d66f592

(cherry picked from commit ccd1d40dd9)
This commit is contained in:
Paul Cornett
2016-12-12 10:55:19 -08:00
parent 20a504707a
commit b2854a20de
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/window.cpp
View File

@@ -5000,9 +5000,7 @@ int wxWindowGTK::GetScrollRange( int orient ) const
// difference due to possible inexactness in floating point arithmetic
static inline bool IsScrollIncrement(double increment, double x)
{
wxASSERT(increment >= 0);
if ( increment == 0. )
return false;
wxASSERT(increment > 0);
const double tolerance = 1.0 / 1024;
return fabs(increment - fabs(x)) < tolerance;
}
@@ -5013,14 +5011,18 @@ wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range)
const int barIndex = range == m_scrollBar[1];
const double value = gtk_range_get_value(range);
GtkAdjustment* adj = gtk_range_get_adjustment(range);
const double value = gtk_adjustment_get_value(adj);
// save previous position
const double oldPos = m_scrollPos[barIndex];
// update current position
m_scrollPos[barIndex] = value;
// If event should be ignored, or integral position has not changed
if (g_blockEventsOnDrag || wxRound(value) == wxRound(oldPos))
// or scrollbar is disabled (webkitgtk is known to cause a "value-changed"
// by setting the GtkAdjustment to all zeros)
if (g_blockEventsOnDrag || wxRound(value) == wxRound(oldPos) ||
gtk_adjustment_get_upper(adj) <= gtk_adjustment_get_page_size(adj))
{
return wxEVT_NULL;
}
@@ -5032,7 +5034,6 @@ wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range)
const double diff = value - oldPos;
const bool isDown = diff > 0;
GtkAdjustment* adj = gtk_range_get_adjustment(range);
if (IsScrollIncrement(gtk_adjustment_get_step_increment(adj), diff))
{
eventType = isDown ? wxEVT_SCROLL_LINEDOWN : wxEVT_SCROLL_LINEUP;