X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1a39f47f8e4e9662ecdecab8f38fca1342202a7..4c410aa14e7818b946351842fed2905239c15592:/src/gtk/slider.cpp?ds=sidebyside

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index a9a4e9a7d3..8d497507d8 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -1,83 +1,150 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        gtk/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "slider.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/slider.h"
-#include "wx/utils.h"
-#include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#if wxUSE_SLIDER
+
+#include "wx/utils.h"
+#include "wx/math.h"
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
-// data
+// idle system
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
-// "value_changed"
+// data
 //-----------------------------------------------------------------------------
 
-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{ 
-    if (!win->HasVMT()) return;
-    if (g_blockEventsOnDrag) return;
-    
-    float diff = win->m_adjust->value - win->m_oldPos;
-    if (fabs(diff) < 0.2) return;
-    win->m_oldPos = win->m_adjust->value;
-  
-    wxEventType command = wxEVT_NULL;
-  
-    float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
-  
-    if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
-    else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
-    else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-    else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-    else command = wxEVT_SCROLL_THUMBTRACK;
-
-    int value = (int)ceil(win->m_adjust->value);
-      
-    int orient = wxHORIZONTAL;
-    if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-  
-    wxScrollEvent event( command, win->GetId(), value, orient );
+extern bool g_blockEventsOnDrag;
+
+// ----------------------------------------------------------------------------
+// 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 );
 }
 
 //-----------------------------------------------------------------------------
-// wxSlider
+// "value_changed"
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
+extern "C" {
+static void gtk_slider_callback( GtkAdjustment *adjust,
+                                 SCROLLBAR_CBACK_ARG
+                                 wxSlider *win )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    const double dvalue = adjust->value;
+    const double diff = dvalue - win->m_oldPos;
+    if ( AreSameAdjustValues(diff, 0) )
+        return;
+
+    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;
+}
 
-wxSlider::wxSlider(void)
+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;
+
+    return FALSE;
 }
 
-wxSlider::~wxSlider(void)
+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;
 }
 
+}
+
+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
+
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
@@ -85,174 +152,200 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
-  
-    PreCreation( parent, id, pos, size, style, name );
-  
-    SetValidator( validator );
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSlider creation failed") );
+        return FALSE;
+    }
 
     m_oldPos = 0.0;
 
-    if (style & wxSL_VERTICAL == wxSL_VERTICAL)
+    if (style & wxSL_VERTICAL)
+        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)
+        {
+            wxSize sz( size );
+            if (sz.x < 35)
+            {
+                sz.x = 35;
+                SetSize( sz );
+            }
+        }
+        else
+        {
+            wxSize sz( size );
+            if (sz.y < 35)
+            {
+                sz.y = 35;
+                SetSize( sz );
+            }
+        }
+    }
     else
-        m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
-    
-    gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
-  
+        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), 
-                        "value_changed",
-		        (GtkSignalFunc) gtk_slider_callback, 
-			(gpointer) this );
-	
+
+    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->AddChild( this );
 
-    (m_parent->m_insertCallback)( m_parent, this );
-  
-    PostCreation();
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
 
-    Show( TRUE );
-    
     return TRUE;
 }
 
-int wxSlider::GetValue(void) const
+int wxSlider::GetValue() const
 {
-    return (int)(m_adjust->value+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;
-  
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+
+    GtkDisableEvents();
+
+    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))
     {
         return;
     }
-      
+
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
+    m_adjust->step_increment = 1.0;
+    m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
+
+    GtkDisableEvents();
+
+    g_signal_emit_by_name (m_adjust, "changed");
 
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    GtkEnableEvents();
 }
 
-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);
 }
 
 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;
 
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    GtkDisableEvents();
+
+    g_signal_emit_by_name (m_adjust, "changed");
+
+    GtkEnableEvents();
 }
 
-int wxSlider::GetPageSize(void) const
+int wxSlider::GetPageSize() const
 {
     return (int)ceil(m_adjust->page_increment);
 }
 
 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;
 
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-}
+    GtkDisableEvents();
 
-int wxSlider::GetThumbLength(void) const
-{
-    return (int)ceil(m_adjust->page_size);
-}
-
-void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
-{
-}
+    g_signal_emit_by_name (m_adjust, "changed");
 
-int wxSlider::GetLineSize(void) const
-{
-    return 0;
+    GtkEnableEvents();
 }
 
-void wxSlider::SetTick( int WXUNUSED(tickPos) )
+int wxSlider::GetThumbLength() const
 {
+    return (int)ceil(m_adjust->page_size);
 }
 
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
+void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
 }
 
-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetLineSize() const
 {
     return 0;
 }
 
-void wxSlider::ClearTicks(void)
-{
-}
-
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
-{
-}
-
-int wxSlider::GetSelEnd(void) const
+bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
-    return 0;
+    GtkRange *range = GTK_RANGE(m_widget);
+    return (range->event_window == window);
 }
 
-int wxSlider::GetSelStart(void) const
+void wxSlider::GtkDisableEvents()
 {
-    return 0;
+    g_signal_handlers_disconnect_by_func (m_adjust,
+                                          (gpointer) gtk_slider_callback,
+                                          this);
 }
 
-void wxSlider::ClearSel(void)
+void wxSlider::GtkEnableEvents()
 {
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_slider_callback), this);
 }
 
-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    GtkRange *range = GTK_RANGE(m_widget);
-    return ( (window == GTK_WIDGET(range)->window) ||
-             (window == range->trough) ||
-	     (window == range->slider) ||
-	     (window == range->step_forw) ||
-	     (window == range->step_back) );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 
-void wxSlider::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-}
+#endif