[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 1c183e6a4d3c4734725ec536f1149431ecfc2fc3..d0a691baea0d1db8e6f8ba43b97b3a178410f270 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -32,9 +32,11 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win)
     if (eventType != wxEVT_NULL)
     {
         const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
     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);
         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)
         {
         win->GetEventHandler()->ProcessEvent(event);
         if (!win->m_isScrolling)
         {


@@ -42,6 +44,7 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win)
             event.SetEventObject(win);
             win->GetEventHandler()->ProcessEvent(event);
         }
             event.SetEventObject(win);
             win->GetEventHandler()->ProcessEvent(event);
         }

+        win->m_blockValueChanged[i] = false;

     }
 }
 }
     }
 }
 }


@@ -62,21 +65,17 @@ gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "button_release_event" from scrollbar
+// "event_after" from scrollbar

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gboolean
-gtk_button_release_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
+static void
+gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    win->m_mouseButtonDown = false;
-    // If thumb tracking
-    if (win->m_isScrolling)
+    if (event->type == GDK_BUTTON_RELEASE)

     {
     {

-        win->m_isScrolling = false;
+        g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win);
+

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


@@ -88,6 +87,30 @@ gtk_button_release_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
         event2.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(event2);
     }
         event2.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(event2);
     }

+}
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win)
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    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;
 }
 
     return false;
 }


@@ -136,6 +159,11 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     g_signal_connect(m_widget, "button_release_event",
                      G_CALLBACK(gtk_button_release_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);
     m_parent->DoAddChild( this );
 
     PostCreation(size);


@@ -171,27 +199,43 @@ void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (GetThumbPosition() != viewStart)
     {
 {
     if (GetThumbPosition() != viewStart)
     {

-        BlockScrollEvent();
-        gtk_range_set_value((GtkRange*)m_widget, viewStart);
-        UnblockScrollEvent();

         GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
         GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;

-        const int i = HasFlag(wxSB_VERTICAL);
-        m_scrollPos[i] = adj->value;
+        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);
+        }

     }
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)
 {
     }
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)
 {

+    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;
     GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;

-    adj->value = position;

     adj->step_increment = 1;
     adj->page_increment = pageSize;
     adj->page_size = thumbSize;
     adj->step_increment = 1;
     adj->page_increment = pageSize;
     adj->page_size = thumbSize;

-    BlockScrollEvent();
-    gtk_range_set_range((GtkRange*)m_widget, 0, range);
-    UnblockScrollEvent();
-    const int i = HasFlag(wxSB_VERTICAL);
-    m_scrollPos[i] = adj->value;
+    adj->upper = range;
+    SetThumbPosition(position);
+    gtk_adjustment_changed(adj);

 }
 
 void wxScrollBar::SetPageSize( int pageLength )
 }
 
 void wxScrollBar::SetPageSize( int pageLength )