X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..5abf8c9d6690662023136fee6135f382863e3715:/src/gtk/slider.cpp?ds=sidebyside diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index adc016c88f..6ad996cbfc 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -16,10 +16,11 @@ #if wxUSE_SLIDER #include "wx/utils.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -34,20 +35,22 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; +static const float sensitivity = 0.02; + //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win ) -{ +{ if (g_isIdle) wxapp_install_idle_handler(); if (!win->m_hasVMT) return; if (g_blockEventsOnDrag) return; float diff = adjust->value - win->m_oldPos; - if (fabs(diff) < 0.2) return; - + if (fabs(diff) < sensitivity) return; + win->m_oldPos = adjust->value; GtkRange *range = GTK_RANGE( win->m_widget ); @@ -57,18 +60,21 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win ) else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLL_LINEDOWN; else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP; else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN; - - int value = (int)ceil(adjust->value); - + + double dvalue = adjust->value; + int value = (int)(dvalue >= 0 ? dvalue - 0.5 : dvalue + 0.5); + int orient = wxHORIZONTAL; - if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL; - + if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL) + orient = wxVERTICAL; + wxScrollEvent event( command, win->GetId(), value, orient ); event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); - + wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() ); cevent.SetEventObject( win ); + cevent.SetInt( value ); win->GetEventHandler()->ProcessEvent( cevent ); } @@ -78,14 +84,6 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win ) IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) -wxSlider::wxSlider(void) -{ -} - -wxSlider::~wxSlider(void) -{ -} - bool wxSlider::Create(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, const wxPoint& pos, const wxSize& size, @@ -93,12 +91,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, { m_acceptsFocus = TRUE; m_needParent = TRUE; - + if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG( T("wxSlider creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxSlider creation failed") ); + return FALSE; } m_oldPos = 0.0; @@ -107,11 +105,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_vscale_new( (GtkAdjustment *) NULL ); else m_widget = gtk_hscale_new( (GtkAdjustment *) NULL ); - + if (style & wxSL_LABELS) { gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE ); - + gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 ); + /* labels need more space and too small window will cause junk to appear on the dialog */ if (style & wxSL_VERTICAL) @@ -137,29 +136,32 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE ); m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); - - gtk_signal_connect( GTK_OBJECT(m_adjust), + + gtk_signal_connect( GTK_OBJECT(m_adjust), "value_changed", - (GtkSignalFunc) gtk_slider_callback, + (GtkSignalFunc) gtk_slider_callback, (gpointer) this ); - + SetRange( minValue, maxValue ); SetValue( value ); - + m_parent->DoAddChild( this ); - + PostCreation(); - + SetBackgroundColour( parent->GetBackgroundColour() ); Show( TRUE ); - + return TRUE; } -int wxSlider::GetValue(void) const +int wxSlider::GetValue() const { - return (int)(m_adjust->value+0.5); + // 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); } void wxSlider::SetValue( int value ) @@ -167,9 +169,9 @@ void wxSlider::SetValue( int value ) float fpos = (float)value; m_oldPos = fpos; if (fabs(fpos-m_adjust->value) < 0.2) return; - + m_adjust->value = fpos; - + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); } @@ -177,25 +179,27 @@ void wxSlider::SetRange( int minValue, int maxValue ) { float fmin = (float)minValue; float fmax = (float)maxValue; - + if ((fabs(fmin-m_adjust->lower) < 0.2) && (fabs(fmax-m_adjust->upper) < 0.2)) { return; } - + m_adjust->lower = fmin; m_adjust->upper = fmax; + m_adjust->step_increment = 1.0; + m_adjust->page_increment = ceil((fmax-fmin) / 10.0); gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); } -int wxSlider::GetMin(void) const +int wxSlider::GetMin() const { return (int)ceil(m_adjust->lower); } -int wxSlider::GetMax(void) const +int wxSlider::GetMax() const { return (int)ceil(m_adjust->upper); } @@ -203,15 +207,15 @@ int wxSlider::GetMax(void) const void wxSlider::SetPageSize( int pageSize ) { float fpage = (float)pageSize; - + if (fabs(fpage-m_adjust->page_increment) < 0.2) return; - + m_adjust->page_increment = fpage; gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); } -int wxSlider::GetPageSize(void) const +int wxSlider::GetPageSize() const { return (int)ceil(m_adjust->page_increment); } @@ -219,15 +223,15 @@ int wxSlider::GetPageSize(void) const void wxSlider::SetThumbLength( int len ) { float flen = (float)len; - + if (fabs(flen-m_adjust->page_size) < 0.2) return; - + m_adjust->page_size = flen; gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); } -int wxSlider::GetThumbLength(void) const +int wxSlider::GetThumbLength() const { return (int)ceil(m_adjust->page_size); } @@ -236,7 +240,7 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) ) { } -int wxSlider::GetLineSize(void) const +int wxSlider::GetLineSize() const { return 0; } @@ -249,12 +253,12 @@ void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) ) { } -int wxSlider::GetTickFreq(void) const +int wxSlider::GetTickFreq() const { return 0; } -void wxSlider::ClearTicks(void) +void wxSlider::ClearTicks() { } @@ -262,17 +266,17 @@ void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) ) { } -int wxSlider::GetSelEnd(void) const +int wxSlider::GetSelEnd() const { return 0; } -int wxSlider::GetSelStart(void) const +int wxSlider::GetSelStart() const { return 0; } -void wxSlider::ClearSel(void) +void wxSlider::ClearSel() { }