docking hint bug fix

[wxWidgets.git] / src / gtk / scrolbar.cpp

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index de1cb7a8883167eca45051ee75ea3736b21eab11..00ea88097329bf6c5205f06d55c51726004bc47c 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -1,211 +1,262 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.cpp
+// Name:        src/gtk/scrolbar.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "scrolbar.h"
-#endif
+#if wxUSE_SCROLLBAR

 
 #include "wx/scrolbar.h"
 
 #include "wx/scrolbar.h"

-#include "wx/utils.h"

 
 

-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-extern bool   g_blockEventsOnDrag;
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxScrollBar
+// "value_changed" from scrollbar

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-    
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
-  
-  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)(win->m_adjust->value+0.5);
-      
-  int orient = wxHORIZONTAL;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxHORIZONTAL;
-  
-  wxScrollEvent event( command, win->GetId(), value, orient );
-  event.SetEventObject( win );
-  win->GetEventHandler()->ProcessEvent( event );
-  
-/*
-  wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
-  cevent.SetEventObject( win );
-  win->ProcessEvent( cevent );
-*/
+extern "C" {
+static void
+gtk_value_changed(GtkRange* range, wxScrollBar* win)
+{
+    wxEventType eventType = win->GetScrollEventType(range);
+    if (eventType != wxEVT_NULL)
+    {
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+        const int i = orient == wxVERTICAL;
+        const int value = win->GetThumbPosition();
+        wxScrollEvent event(eventType, win->GetId(), value, orient);
+        event.SetEventObject(win);
+        win->m_blockValueChanged[i] = true;
+        win->GetEventHandler()->ProcessEvent(event);
+        if (!win->m_isScrolling)
+        {
+            wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
+            event.SetEventObject(win);
+            win->GetEventHandler()->ProcessEvent(event);
+        }
+        win->m_blockValueChanged[i] = false;
+    }
+}

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
+//-----------------------------------------------------------------------------
+// "button_press_event" from scrollbar
+//-----------------------------------------------------------------------------

 
 

-wxScrollBar::~wxScrollBar(void)
+extern "C" {
+static gboolean
+gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)

 {
 {

+    // don't need to install idle handler, its done from "event" signal
+
+    win->m_mouseButtonDown = true;
+    return false;
+}

 }
 
 }
 

-bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           long style, const wxValidator& validator, const wxString& name )
+//-----------------------------------------------------------------------------
+// "event_after" from scrollbar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win)

 {
 {

-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
+    if (event->type == GDK_BUTTON_RELEASE)
+    {
+        g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win);

 
 

-  m_oldPos = 0.0;
+        const int value = win->GetThumbPosition();
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;

 
 

-  if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-    m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
-  else
-    m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
-    
-  m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
-  
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
-                     (GtkSignalFunc) gtk_scrollbar_callback, (gpointer) this );
-  
-  PostCreation();
-  
-  Show( TRUE );
-    
-  return TRUE;
+        wxScrollEvent event(wxEVT_SCROLL_THUMBRELEASE, win->GetId(), value, orient);
+        event.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(event);
+
+        wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
+        event2.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(event2);
+    }
+}

 }
 
 }
 

-int wxScrollBar::GetPosition(void) const
+//-----------------------------------------------------------------------------
+// "button_release_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win)

 {
 {

-  return (int)(m_adjust->value+0.5);
+    // don't need to install idle handler, its done from "event" signal
+
+    win->m_mouseButtonDown = false;
+    // If thumb tracking
+    if (win->m_isScrolling)
+    {
+        win->m_isScrolling = false;
+        // Hook up handler to send thumb release event after this emission is finished.
+        // To allow setting scroll position from event handler, sending event must
+        // be deferred until after the GtkRange handler for this signal has run
+        g_signal_handlers_unblock_by_func(range, (void*)gtk_event_after, win);
+    }
+
+    return false;
+}

 }
 
 }
 

-int wxScrollBar::GetThumbSize() const
+//-----------------------------------------------------------------------------
+// wxScrollBar
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
+
+wxScrollBar::wxScrollBar()

 {
 {

-  return (int)(m_adjust->page_size+0.5);

 }
 
 }
 

-int wxScrollBar::GetPageSize() const
+wxScrollBar::~wxScrollBar()

 {
 {

-  return (int)(m_adjust->page_increment+0.5);

 }
 
 }
 

-int wxScrollBar::GetRange() const
+bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
+           const wxPoint& pos, const wxSize& size,
+           long style, const wxValidator& validator, const wxString& name )

 {
 {

-  return (int)(m_adjust->upper+0.5);
+    m_needParent = true;
+    m_acceptsFocus = true;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxScrollBar creation failed") );
+        return false;
+    }
+
+    const bool isVertical = (style & wxSB_VERTICAL) != 0;
+    if (isVertical)
+        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
+    else
+        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+
+    m_scrollBar[int(isVertical)] = (GtkRange*)m_widget;
+
+    g_signal_connect(m_widget, "value_changed",
+                     G_CALLBACK(gtk_value_changed), this);
+    g_signal_connect(m_widget, "button_press_event",
+                     G_CALLBACK(gtk_button_press_event), this);
+    g_signal_connect(m_widget, "button_release_event",
+                     G_CALLBACK(gtk_button_release_event), this);
+
+    gulong handler_id;
+    handler_id = g_signal_connect(
+        m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
+    g_signal_handler_block(m_widget, handler_id);
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;

 }
 
 }
 

-void wxScrollBar::SetPosition( int viewStart )
+int wxScrollBar::GetThumbPosition() const

 {
 {

-  float fpos = (float)viewStart;
-  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" );
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->value + 0.5);

 }
 
 }
 

-void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
-      bool WXUNUSED(refresh) )
+int wxScrollBar::GetThumbSize() const

 {
 {

-  float fpos = (float)position;
-  m_oldPos = fpos;
-  float frange = (float)range;
-  float fthumb = (float)thumbSize;
-  float fpage = (float)pageSize;
-      
-  if ((fabs(fpos-m_adjust->value) < 0.2) &&
-      (fabs(frange-m_adjust->upper) < 0.2) &&
-      (fabs(fthumb-m_adjust->page_size) < 0.2) &&
-      (fabs(fpage-m_adjust->page_increment) < 0.2))
-      return;
-      
-  m_adjust->lower = 0.0;
-  m_adjust->upper = frange;
-  m_adjust->value = fpos;
-  m_adjust->step_increment = 1.0;
-  m_adjust->page_increment = (float)(wxMax(fpage-2,0));
-  m_adjust->page_size = fthumb;
-
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->page_size);

 }
 
 }
 

-// Backward compatibility
-int wxScrollBar::GetValue(void) const
+int wxScrollBar::GetPageSize() const

 {
 {

-  return GetPosition();
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->page_increment);

 }
 
 }
 

-void wxScrollBar::SetValue( int viewStart )
+int wxScrollBar::GetRange() const

 {
 {

-  SetPosition( viewStart );
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->upper);

 }
 
 }
 

-void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
+void wxScrollBar::SetThumbPosition( int viewStart )

 {
 {

-  int pos = (int)(m_adjust->value+0.5);
-  int thumb = (int)(m_adjust->page_size+0.5);
-  int page = (int)(m_adjust->page_increment+0.5);
-  int range = (int)(m_adjust->upper+0.5);
-  
-  *viewStart = pos;
-  *viewLength = range;
-  *objectLength = thumb;
-  *pageLength = page;
+    if (GetThumbPosition() != viewStart)
+    {
+        GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+        const int i = (GtkRange*)m_widget == m_scrollBar[1];
+        const int max = int(adj->upper - adj->page_size);
+        if (viewStart > max)
+            viewStart = max;
+        if (viewStart < 0)
+            viewStart = 0;
+
+        m_scrollPos[i] =
+        adj->value = viewStart;
+        // If a "value_changed" signal emission is not already in progress
+        if (!m_blockValueChanged[i])
+        {
+            gtk_adjustment_value_changed(adj);
+        }
+    }

 }
 
 }
 

-int wxScrollBar::GetViewLength() const
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)

 {
 {

-  return (int)(m_adjust->upper+0.5);
+    if (range == 0)
+    {
+        // GtkRange requires upper > lower
+        range =
+        thumbSize = 1;
+    }
+    if (position > range - thumbSize)
+        position = range - thumbSize;
+    if (position < 0)
+        position = 0;
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    adj->step_increment = 1;
+    adj->page_increment = pageSize;
+    adj->page_size = thumbSize;
+    adj->upper = range;
+    SetThumbPosition(position);
+    gtk_adjustment_changed(adj);

 }
 
 }
 

-int wxScrollBar::GetObjectLength() const
+void wxScrollBar::SetPageSize( int pageLength )

 {
 {

-  return (int)(m_adjust->page_size+0.5);
+    SetScrollbar(GetThumbPosition(), GetThumbSize(), GetRange(), pageLength);

 }
 
 }
 

-void wxScrollBar::SetPageSize( int pageLength )
+void wxScrollBar::SetRange(int range)

 {
 {

-  int pos = (int)(m_adjust->value+0.5);
-  int thumb = (int)(m_adjust->page_size+0.5);
-  int range = (int)(m_adjust->upper+0.5);
-  SetScrollbar( pos, thumb, range, pageLength );
+    SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());

 }
 
 }
 

-void wxScrollBar::SetObjectLength( int objectLength )
+GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-  int pos = (int)(m_adjust->value+0.5);
-  int page = (int)(m_adjust->page_increment+0.5);
-  int range = (int)(m_adjust->upper+0.5);
-  SetScrollbar( pos, objectLength, range, page );
+    return GTK_WIDGET(GTK_RANGE(m_widget))->window;

 }
 
 }
 

-void wxScrollBar::SetViewLength( int viewLength )
+// static
+wxVisualAttributes
+wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-  int pos = (int)(m_adjust->value+0.5);
-  int thumb = (int)(m_adjust->page_size+0.5);
-  int page = (int)(m_adjust->page_increment+0.5);
-  SetScrollbar( pos, thumb, viewLength, page );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);

 }
 
 }
 

+#endif // wxUSE_SCROLLBAR