X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/463c4d7193481ac27626b282ccf0ac178f029abd..9419b0d64948485ab83122484ffe4b7dcde25905:/src/gtk1/slider.cpp diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 740a202322..594d0ae265 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "slider.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,7 +16,7 @@ #include "wx/utils.h" #include "wx/math.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -35,12 +31,53 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; -static const float sensitivity = 0.02; +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +// compare 2 adjustment values up to some (hardcoded) precision +static inline bool AreSameAdjustValues(double x, double y) +{ + return fabs(x - y) < 0.02; +} + +static inline int AdjustValueToInt(double x) +{ + // we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and + // -0.9 is rounded to -1 + return (int)(x < 0 ? x - 0.5 : x + 0.5); +} + +// process a scroll event +static void +ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue) +{ + int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL + : wxHORIZONTAL; + + int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); + wxScrollEvent event( evtType, win->GetId(), value, orient ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); + + if ( evtType != wxEVT_SCROLL_THUMBTRACK ) + { + wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient); + event2.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event2 ); + } + + wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() ); + cevent.SetEventObject( win ); + cevent.SetInt( value ); + win->GetEventHandler()->ProcessEvent( cevent ); +} //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_slider_callback( GtkAdjustment *adjust, SCROLLBAR_CBACK_ARG wxSlider *win ) @@ -50,27 +87,42 @@ static void gtk_slider_callback( GtkAdjustment *adjust, if (!win->m_hasVMT) return; if (g_blockEventsOnDrag) return; - float diff = adjust->value - win->m_oldPos; - if (fabs(diff) < sensitivity) return; + const double dvalue = adjust->value; + const double diff = dvalue - win->m_oldPos; + if ( AreSameAdjustValues(diff, 0) ) + return; - win->m_oldPos = adjust->value; + wxEventType evtType; + evtType = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget)); - wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget)); + ProcessScrollEvent(win, evtType, dvalue); - double dvalue = adjust->value; - int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); + win->m_oldPos = dvalue; +} - int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL - : wxHORIZONTAL; +static gint gtk_slider_button_press_callback( GtkWidget * /* widget */, + GdkEventButton * /* gdk_event */, + wxWindowGTK *win) +{ + // indicate that the thumb is being dragged with the mouse + win->m_isScrolling = true; - wxScrollEvent event( command, win->GetId(), value, orient ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + return FALSE; +} + +static gint gtk_slider_button_release_callback( GtkWidget *scale, + GdkEventButton * /* gdk_event */, + wxSlider *win) +{ + // not scrolling any longer + win->m_isScrolling = false; + + ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE, + GTK_RANGE(scale)->adjustment->value); + + return FALSE; +} - wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() ); - cevent.SetEventObject( win ); - cevent.SetInt( value ); - win->GetEventHandler()->ProcessEvent( cevent ); } //----------------------------------------------------------------------------- @@ -133,6 +185,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); GtkEnableEvents(); + gtk_signal_connect( GTK_OBJECT(m_widget), + "button_press_event", + (GtkSignalFunc)gtk_slider_button_press_callback, + (gpointer) this ); + gtk_signal_connect( GTK_OBJECT(m_widget), + "button_release_event", + (GtkSignalFunc)gtk_slider_button_release_callback, + (gpointer) this ); SetRange( minValue, maxValue ); SetValue( value ); @@ -146,31 +206,29 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, int wxSlider::GetValue() const { - // we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and - // -0.9 is rounded to -1 - double val = m_adjust->value; - return (int)(val < 0 ? val - 0.5 : val + 0.5); + return AdjustValueToInt(m_adjust->value); } void wxSlider::SetValue( int value ) { - float fpos = (float)value; + double fpos = (double)value; m_oldPos = fpos; - if (fabs(fpos-m_adjust->value) < 0.2) return; + if ( AreSameAdjustValues(fpos, m_adjust->value) ) + return; m_adjust->value = fpos; GtkDisableEvents(); - + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); - + GtkEnableEvents(); } void wxSlider::SetRange( int minValue, int maxValue ) { - float fmin = (float)minValue; - float fmax = (float)maxValue; + double fmin = (double)minValue; + double fmax = (double)maxValue; if ((fabs(fmin-m_adjust->lower) < 0.2) && (fabs(fmax-m_adjust->upper) < 0.2)) @@ -184,9 +242,9 @@ void wxSlider::SetRange( int minValue, int maxValue ) m_adjust->page_increment = ceil((fmax-fmin) / 10.0); GtkDisableEvents(); - + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); - + GtkEnableEvents(); } @@ -202,16 +260,16 @@ int wxSlider::GetMax() const void wxSlider::SetPageSize( int pageSize ) { - float fpage = (float)pageSize; + double fpage = (double)pageSize; if (fabs(fpage-m_adjust->page_increment) < 0.2) return; m_adjust->page_increment = fpage; GtkDisableEvents(); - + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); - + GtkEnableEvents(); } @@ -222,16 +280,16 @@ int wxSlider::GetPageSize() const void wxSlider::SetThumbLength( int len ) { - float flen = (float)len; + double flen = (double)len; if (fabs(flen-m_adjust->page_size) < 0.2) return; m_adjust->page_size = flen; GtkDisableEvents(); - + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); - + GtkEnableEvents(); } @@ -252,15 +310,11 @@ int wxSlider::GetLineSize() const bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) { GtkRange *range = GTK_RANGE(m_widget); -#ifdef __WXGTK20__ - return (range->event_window == window); -#else return ( (window == GTK_WIDGET(range)->window) || (window == range->trough) || (window == range->slider) || (window == range->step_forw) || (window == range->step_back) ); -#endif } void wxSlider::GtkDisableEvents()