X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8e24dfa9322702d56a125586a7d4a37f4a5dfd7..b7c542d5c6104aa3a52b0cafda59dff03510e888:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index f3ab24213f..42de025936 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/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" @@ -19,9 +15,7 @@ #if wxUSE_SLIDER #include "wx/utils.h" - -#include - +#include "wx/math.h" #include "wx/gtk/private.h" //----------------------------------------------------------------------------- @@ -37,14 +31,54 @@ 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 ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -52,27 +86,56 @@ 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; + if ( win->m_isScrolling ) + evtType = wxEVT_SCROLL_THUMBTRACK; + // it could seem that UP/DOWN are inversed but this is what wxMSW does + else if ( AreSameAdjustValues(diff, adjust->step_increment) ) + evtType = wxEVT_SCROLL_LINEDOWN; + else if ( AreSameAdjustValues(diff, -adjust->step_increment) ) + evtType = wxEVT_SCROLL_LINEUP; + else if ( AreSameAdjustValues(diff, adjust->page_increment) ) + evtType = wxEVT_SCROLL_PAGEDOWN; + else if ( AreSameAdjustValues(diff, -adjust->page_increment) ) + evtType = wxEVT_SCROLL_PAGEUP; + else if ( AreSameAdjustValues(adjust->value, adjust->lower) ) + evtType = wxEVT_SCROLL_TOP; + else if ( AreSameAdjustValues(adjust->value, adjust->upper) ) + evtType = wxEVT_SCROLL_BOTTOM; + + ProcessScrollEvent(win, evtType, dvalue); + + win->m_oldPos = dvalue; +} - wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget)); +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; - double dvalue = adjust->value; - int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); + return FALSE; +} - int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL - : wxHORIZONTAL; +static gint gtk_slider_button_release_callback( GtkWidget *scale, + GdkEventButton * /* gdk_event */, + wxSlider *win) +{ + // not scrolling any longer + win->m_isScrolling = false; - wxScrollEvent event( command, win->GetId(), value, orient ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + 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 ); } //----------------------------------------------------------------------------- @@ -134,48 +197,52 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); + if (style & wxSL_INVERSE) + gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE ); + GtkEnableEvents(); + g_signal_connect (m_widget, "button_press_event", + G_CALLBACK (gtk_slider_button_press_callback), + this); + g_signal_connect (m_widget, "button_release_event", + G_CALLBACK (gtk_slider_button_release_callback), + this); SetRange( minValue, maxValue ); SetValue( value ); m_parent->DoAddChild( this ); - PostCreation(); - InheritAttributes(); - - Show( TRUE ); + PostCreation(size); return TRUE; } 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" ); - + + g_signal_emit_by_name (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)) @@ -189,9 +256,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" ); - + + g_signal_emit_by_name (m_adjust, "changed"); + GtkEnableEvents(); } @@ -207,16 +274,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" ); - + + g_signal_emit_by_name (m_adjust, "changed"); + GtkEnableEvents(); } @@ -227,16 +294,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" ); - + + g_signal_emit_by_name (m_adjust, "changed"); + GtkEnableEvents(); } @@ -257,36 +324,27 @@ 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::ApplyWidgetStyle() +void wxSlider::GtkDisableEvents() { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + g_signal_handlers_disconnect_by_func (m_adjust, + (gpointer) gtk_slider_callback, + this); } -void wxSlider::GtkDisableEvents() +void wxSlider::GtkEnableEvents() { - gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust), - GTK_SIGNAL_FUNC(gtk_slider_callback), - (gpointer) this ); + g_signal_connect (m_adjust, "value_changed", + G_CALLBACK (gtk_slider_callback), this); } -void wxSlider::GtkEnableEvents() +// static +wxVisualAttributes +wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - gtk_signal_connect( GTK_OBJECT (m_adjust), - "value_changed", - GTK_SIGNAL_FUNC(gtk_slider_callback), - (gpointer) this ); + return GetDefaultAttributesFromGTKWidget(gtk_vscale_new); } #endif