#include "wx/utils.h"
#include "wx/math.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------
// idle system
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"
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;
+}
- wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
- cevent.SetEventObject( win );
- cevent.SetInt( value );
- win->GetEventHandler()->ProcessEvent( cevent );
+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;
}
+
}
//-----------------------------------------------------------------------------
m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
-#ifdef __WXGTK20__
- if (style & wxSL_INVERSE)
- gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
-#endif
-
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 );
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))
m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
GtkDisableEvents();
-
+
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-
+
GtkEnableEvents();
}
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();
}
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();
}
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()
projects / wxWidgets.git / blobdiff