X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96aa4d9eb296b3dfc468a351ce013bf92fab983..d10e22fe8ad283f37b1809349028ffc282e393ce:/src/gtk/scrolbar.cpp diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index 827cc538d3..00ea880973 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/scrolbar.cpp @@ -1,91 +1,118 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.cpp +// Name: src/gtk/scrolbar.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// 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/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif + +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- -// data +// "value_changed" from scrollbar //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +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 //----------------------------------------------------------------------------- -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 = wxVERTICAL; - - 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 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; +} } //----------------------------------------------------------------------------- -// "button_press_event" from slider +// "event_after" from scrollbar //----------------------------------------------------------------------------- -static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win ) +extern "C" { +static void +gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win) { - if (gdk_event->window != widget->slider) return FALSE; - - win->m_isScrolling = TRUE; - - return FALSE; + if (event->type == GDK_BUTTON_RELEASE) + { + 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; + + 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); + } +} } //----------------------------------------------------------------------------- -// "button_release_event" from slider +// "button_release_event" from scrollbar //----------------------------------------------------------------------------- -static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win ) +extern "C" { +static gboolean +gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win) { - if (gdk_event->window != widget->slider) return FALSE; - - gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" ); - - win->m_isScrolling = FALSE; - - return FALSE; + // 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; +} } //----------------------------------------------------------------------------- @@ -94,7 +121,11 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventBut IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) -wxScrollBar::~wxScrollBar(void) +wxScrollBar::wxScrollBar() +{ +} + +wxScrollBar::~wxScrollBar() { } @@ -102,162 +133,130 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name ) { - m_needParent = TRUE; - - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); - - m_oldPos = 0.0; - - 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 ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "button_press_event", - (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "button_release_event", - (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this ); - - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); - - return TRUE; -} + m_needParent = true; + m_acceptsFocus = true; -int wxScrollBar::GetPosition(void) const -{ - return (int)(m_adjust->value+0.5); -} + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxScrollBar creation failed") ); + return false; + } -int wxScrollBar::GetThumbSize() const -{ - return (int)(m_adjust->page_size+0.5); -} + const bool isVertical = (style & wxSB_VERTICAL) != 0; + if (isVertical) + m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL ); + else + m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL ); -int wxScrollBar::GetPageSize() const -{ - return (int)(m_adjust->page_increment+0.5); -} + m_scrollBar[int(isVertical)] = (GtkRange*)m_widget; -int wxScrollBar::GetRange() const -{ - return (int)(m_adjust->upper+0.5); -} + 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); -void wxScrollBar::SetPosition( int viewStart ) -{ - float fpos = (float)viewStart; - m_oldPos = fpos; - if (fabs(fpos-m_adjust->value) < 0.2) return; - m_adjust->value = fpos; + 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 (!m_isScrolling) - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + return true; } -void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool WXUNUSED(refresh) ) +int wxScrollBar::GetThumbPosition() const { - 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)) - { - SetPosition( position ); - return; - } - - 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; - - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->value + 0.5); } -// Backward compatibility -int wxScrollBar::GetValue(void) const +int wxScrollBar::GetThumbSize() const { - return GetPosition(); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->page_size); } -void wxScrollBar::SetValue( int viewStart ) +int wxScrollBar::GetPageSize() const { - SetPosition( viewStart ); + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->page_increment); } -void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const +int wxScrollBar::GetRange() 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; + GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment; + return int(adj->upper); } -int wxScrollBar::GetViewLength() const +void wxScrollBar::SetThumbPosition( int viewStart ) { - return (int)(m_adjust->upper+0.5); + 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::GetObjectLength() const +void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool) { - 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 ); + SetScrollbar(GetThumbPosition(), GetThumbSize(), GetRange(), pageLength); } -void wxScrollBar::SetObjectLength( int objectLength ) +void wxScrollBar::SetRange(int range) { - 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(), range, GetPageSize()); } -void wxScrollBar::SetViewLength( int viewLength ) +GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) 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); - SetScrollbar( pos, thumb, viewLength, page ); + return GTK_WIDGET(GTK_RANGE(m_widget))->window; } -bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window ) +// static +wxVisualAttributes +wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - GtkRange *range = GTK_RANGE(m_widget); - return ( (window == GTK_WIDGET(range)->window) || - (window == range->trough) || - (window == range->slider) || - (window == range->step_forw) || - (window == range->step_back) ); + return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new); } + +#endif // wxUSE_SCROLLBAR