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)
{
event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event);
}
+ win->m_blockValueChanged[i] = 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;
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;
}
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);
{
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;
+ // 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)
{
+ 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 )