X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/add7cadd99d1b40dc012db655643f9c8c7080029..20a0e99964951da1c54abf11f6dd7cd2925b8b0e:/src/gtk/scrolbar.cpp

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 1c183e6a4d..dc05a81b0a 100644
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -54,29 +54,23 @@ extern "C" {
 static gboolean
 gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     win->m_mouseButtonDown = true;
     return false;
 }
 }
 
 //-----------------------------------------------------------------------------
-// "button_release_event" from scrollbar
+// "event_after" from scrollbar
 //-----------------------------------------------------------------------------
 
 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;
 
@@ -88,6 +82,27 @@ gtk_button_release_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
         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)
+{
+    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;
 }
@@ -111,9 +126,6 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
-    m_needParent = true;
-    m_acceptsFocus = true;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
@@ -129,13 +141,18 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     m_scrollBar[int(isVertical)] = (GtkRange*)m_widget;
 
-    g_signal_connect(m_widget, "value_changed",
+    g_signal_connect_after(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);
@@ -171,27 +188,46 @@ void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (GetThumbPosition() != viewStart)
     {
-        BlockScrollEvent();
-        gtk_range_set_value((GtkRange*)m_widget, viewStart);
-        UnblockScrollEvent();
         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;
+        
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
+
+        gtk_adjustment_value_changed(adj);
+
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
     }
 }
 
 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;
-    adj->value = position;
     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 )
@@ -204,10 +240,9 @@ void wxScrollBar::SetRange(int range)
     SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());
 }
 
-bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    GtkRange *range = GTK_RANGE(m_widget);
-    return ( (window == GTK_WIDGET(range)->window) );
+    return m_widget->window;
 }
 
 // static