X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afa7bd1eef03eb167b7f70412f1b4ef08ad73138..8e5ec129614e2473fd240f2a6e94ee56e3a9039b:/src/gtk/scrolbar.cpp diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index 91895aab94..d0a691baea 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/scrolbar.cpp @@ -14,143 +14,105 @@ #include "wx/scrolbar.h" -#include "wx/utils.h" -#include "wx/math.h" -#include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- -// data +// "value_changed" from scrollbar //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -static wxEventType g_currentUpDownEvent = wxEVT_NULL; - -static const float sensitivity = 0.02; +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; + } +} +} //----------------------------------------------------------------------------- -// "value_changed" +// "button_press_event" from scrollbar //----------------------------------------------------------------------------- -// FIXME: is GtkScrollType really passed to us as 2nd argument? - extern "C" { -static void gtk_scrollbar_callback( GtkAdjustment *adjust, - wxScrollBar *win ) +static gboolean +gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win) { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; - if (g_blockEventsOnDrag) return; - - float diff = adjust->value - win->m_oldPos; - if (fabs(diff) < sensitivity) return; - - win->m_oldPos = adjust->value; - - wxEventType command = GtkScrollTypeToWx(GTK_SCROLL_JUMP); - - double dvalue = adjust->value; - int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); - - int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; - - // throw a LINEUP / LINEDOWN event if necessary - if (g_currentUpDownEvent != wxEVT_NULL) - { - wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); - } - - // throw other event (wxEVT_SCROLL_THUMBTRACK) - 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 ); -*/ + win->m_mouseButtonDown = true; + return false; } } //----------------------------------------------------------------------------- -// "button_press_event" from slider +// "event_after" from scrollbar //----------------------------------------------------------------------------- + extern "C" { -static gint gtk_scrollbar_button_press_callback( GtkRange *widget, - GdkEventButton *gdk_event, - wxScrollBar *win ) +static void +gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win) { - if (g_isIdle) wxapp_install_idle_handler(); - - // check if a LINEUP/LINEDOWN event must be thrown - // I suppose here the size of scrollbar top/bottom buttons is 16px height - if (gdk_event->type == GDK_BUTTON_PRESS && gdk_event->button == 1) + if (event->type == GDK_BUTTON_RELEASE) { - int scroll_height, mouse_pos; + g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win); - // get the mouse position when the click is done - if (win->HasFlag(wxSB_VERTICAL)) - { - scroll_height = GTK_WIDGET(widget)->allocation.height - 16; - mouse_pos = (int)gdk_event->y; - } - else - { - scroll_height = GTK_WIDGET(widget)->allocation.width - 16; - mouse_pos = (int)gdk_event->x; - } + const int value = win->GetThumbPosition(); + const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; - // compare mouse position to scrollbar height - if (mouse_pos > scroll_height) - g_currentUpDownEvent = wxEVT_SCROLL_LINEDOWN; - else if (mouse_pos < 16) - g_currentUpDownEvent = wxEVT_SCROLL_LINEUP; - } + wxScrollEvent event(wxEVT_SCROLL_THUMBRELEASE, win->GetId(), value, orient); + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); - return FALSE; + wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient); + event2.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event2); + } } } //----------------------------------------------------------------------------- -// "button_release_event" from slider +// "button_release_event" from scrollbar //----------------------------------------------------------------------------- extern "C" { -static gint -gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), - GdkEventButton *WXUNUSED(gdk_event), - wxScrollBar *win ) +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) { - wxEventType command = wxEVT_SCROLL_THUMBRELEASE; - int value = (int)ceil(win->m_adjust->value); - int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; - - wxScrollEvent event( command, win->GetId(), value, orient ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + 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); } - win->m_isScrolling = false; - - // reset the LINEUP/LINEDOWN flag when the mouse button is released - g_currentUpDownEvent = wxEVT_NULL; - - return FALSE; + return false; } } @@ -160,6 +122,10 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) +wxScrollBar::wxScrollBar() +{ +} + wxScrollBar::~wxScrollBar() { } @@ -178,23 +144,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, return false; } - m_oldPos = 0.0; - - if ((style & wxSB_VERTICAL) == wxSB_VERTICAL) + 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_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); + m_scrollBar[int(isVertical)] = (GtkRange*)m_widget; - g_signal_connect (m_adjust, "value_changed", - G_CALLBACK (gtk_scrollbar_callback), this); - g_signal_connect (m_widget, "button_press_event", - G_CALLBACK (gtk_scrollbar_button_press_callback), - this); - g_signal_connect (m_widget, "button_release_event", - G_CALLBACK (gtk_scrollbar_button_release_callback), - this); + 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 ); @@ -205,128 +173,79 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, int wxScrollBar::GetThumbPosition() const { - double val = m_adjust->value; - return (int)(val < 0 ? val - 0.5 : val + 0.5); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->value + 0.5); } int wxScrollBar::GetThumbSize() const { - return (int)(m_adjust->page_size+0.5); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->page_size); } int wxScrollBar::GetPageSize() const { - return (int)(m_adjust->page_increment+0.5); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->page_increment); } int wxScrollBar::GetRange() const { - return (int)(m_adjust->upper+0.5); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->upper); } void wxScrollBar::SetThumbPosition( int viewStart ) { - if (m_isScrolling) return; - - float fpos = (float)viewStart; - m_oldPos = fpos; - if (fabs(fpos-m_adjust->value) < 0.2) return; - m_adjust->value = fpos; - - g_signal_handlers_disconnect_by_func (m_adjust, - (gpointer) gtk_scrollbar_callback, - this); - - g_signal_emit_by_name (m_adjust, "value_changed"); - - g_signal_connect (m_adjust, "value_changed", - G_CALLBACK (gtk_scrollbar_callback), this); -} - -void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool WXUNUSED(refresh) ) -{ - float fpos = (float)position; - float frange = (float)range; - float fthumb = (float)thumbSize; - float fpage = (float)pageSize; - - if ((fabs(frange-m_adjust->upper) < 0.2) && - (fabs(fthumb-m_adjust->page_size) < 0.2) && - (fabs(fpage-m_adjust->page_increment) < 0.2)) + if (GetThumbPosition() != viewStart) { - SetThumbPosition( position ); - return; + 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); + } } - - m_oldPos = fpos; - - 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,0)); - m_adjust->page_size = fthumb; - - g_signal_emit_by_name (m_adjust, "changed"); -} - -/* Backward compatibility */ -int wxScrollBar::GetValue() const -{ - return GetThumbPosition(); } -void wxScrollBar::SetValue( int viewStart ) +void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool) { - SetThumbPosition( viewStart ); -} - -void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const -{ - 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; -} - -int wxScrollBar::GetViewLength() const -{ - return (int)(m_adjust->upper+0.5); -} - -int wxScrollBar::GetObjectLength() const -{ - return (int)(m_adjust->page_size+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); } void wxScrollBar::SetPageSize( int pageLength ) { - 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 ); -} - -void wxScrollBar::SetObjectLength( int objectLength ) -{ - 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 ); + SetScrollbar(GetThumbPosition(), GetThumbSize(), GetRange(), pageLength); } -void wxScrollBar::SetViewLength( int viewLength ) +void wxScrollBar::SetRange(int range) { - 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 ); + SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize()); } bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window ) @@ -335,11 +254,6 @@ bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window ) return ( (window == GTK_WIDGET(range)->window) ); } -wxSize wxScrollBar::DoGetBestSize() const -{ - return wxControl::DoGetBestSize(); -} - // static wxVisualAttributes wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) @@ -347,4 +261,4 @@ wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new); } -#endif +#endif // wxUSE_SCROLLBAR