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

Fix sending SPIN_UP/DOWN events when value wraps around (wxGTK)

Browse Source 
SPIN_UP/DOWN events should represent the arrow being pressed,
not a direction in which the value changed (see documentation).

Closes #17957.
This commit is contained in:
Artur Wieczorek
2017-09-23 19:08:29 +02:00
parent fd33fcf191
commit 086793ceef
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/spinbutt.cpp
View File

@@ -30,8 +30,7 @@ extern "C" {
static void
gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
{
const double value = gtk_spin_button_get_value(spinbutton);
const int pos = int(value);
const int pos = gtk_spin_button_get_value_as_int(spinbutton);
const int oldPos = win->m_pos;
if (g_blockEventsOnDrag || pos == oldPos)
{
@@ -39,7 +38,19 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
return;
}
wxSpinEvent event(pos > oldPos ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, win->GetId());
int inc = pos - oldPos;
// Adjust for wrap arounds
// (Doesn't work for degenerated cases, like [0..1] range.)
if ( win->HasFlag(wxSP_WRAP) )
{
if ( inc > 1 )
inc = -1;
else if ( inc < -1 )
inc = 1;
}
wxASSERT( inc == 1 || inc == -1 );
wxSpinEvent event(inc > 0 ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, win->GetId());
event.SetPosition(pos);
event.SetEventObject(win);