X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..dfa2a1d92bcf7256cacd751a81fe131fedc121af:/src/gtk1/scrolbar.cpp?ds=sidebyside diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp index c0d729487d..42fa93452d 100644 --- a/src/gtk1/scrolbar.cpp +++ b/src/gtk1/scrolbar.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,25 @@ #pragma implementation "scrolbar.h" #endif +#include "wx/defs.h" + +#if wxUSE_SCROLLBAR + #include "wx/scrolbar.h" + #include "wx/utils.h" + #include +#include "wx/gtk/private.h" + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -23,51 +38,43 @@ extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; +static const float sensitivity = 0.02; + //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- -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 (win->m_isScrolling) - { - command = wxEVT_SCROLL_THUMBTRACK; - } - else - { - if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM; - else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP; - else 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 ); - +// FIXME: is GtkScrollType really passed to us as 2nd argument? + +static void gtk_scrollbar_callback( GtkAdjustment *adjust, + SCROLLBAR_CBACK_ARG + 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(GET_SCROLL_TYPE(win->m_widget)); + + double dvalue = adjust->value; + int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); + + int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; + + 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 ); + wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() ); + cevent.SetEventObject( win ); + win->ProcessEvent( cevent ); */ } @@ -75,30 +82,50 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi // "button_press_event" from slider //----------------------------------------------------------------------------- -static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), - GdkEventButton *WXUNUSED(gdk_event), - wxScrollBar *win ) +static gint gtk_scrollbar_button_press_callback( GtkRange *widget, + GdkEventButton *gdk_event, + wxScrollBar *win ) { - win->m_isScrolling = TRUE; + if (g_isIdle) wxapp_install_idle_handler(); + // g_blockEventsOnScroll = TRUE; doesn't work in DialogEd - - return FALSE; + + // FIXME: there is no slider field any more, what was meant here? +#ifndef __WXGTK20__ + win->m_isScrolling = (gdk_event->window == widget->slider); +#endif + + return FALSE; } //----------------------------------------------------------------------------- // "button_release_event" from slider //----------------------------------------------------------------------------- -static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), - GdkEventButton *WXUNUSED(gdk_event), - wxScrollBar *win ) +static gint +gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), + GdkEventButton *WXUNUSED(gdk_event), + wxScrollBar *win ) { - win->m_isScrolling = FALSE; + if (g_isIdle) + wxapp_install_idle_handler(); + // g_blockEventsOnScroll = FALSE; - - gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" ); - - return FALSE; + + 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; + + return FALSE; } //----------------------------------------------------------------------------- @@ -107,7 +134,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) -wxScrollBar::~wxScrollBar(void) +wxScrollBar::~wxScrollBar() { } @@ -115,175 +142,203 @@ 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; - - 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 ); - - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); - - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); - - return TRUE; + m_needParent = TRUE; + m_acceptsFocus = TRUE; + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxScrollBar creation failed") ); + return FALSE; + } + + m_oldPos = 0.0; + + if ((style & wxSB_VERTICAL) == wxSB_VERTICAL) + 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) ); + + 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 ); + + m_parent->DoAddChild( this ); + + PostCreation(); + + SetBestSize(size); + + SetBackgroundColour( parent->GetBackgroundColour() ); + + Show( TRUE ); + + return TRUE; } -int wxScrollBar::GetThumbPosition(void) const +int wxScrollBar::GetThumbPosition() const { - return (int)(m_adjust->value+0.5); + double val = m_adjust->value; + return (int)(val < 0 ? val - 0.5 : val + 0.5); } int wxScrollBar::GetThumbSize() const { - return (int)(m_adjust->page_size+0.5); + return (int)(m_adjust->page_size+0.5); } int wxScrollBar::GetPageSize() const { - return (int)(m_adjust->page_increment+0.5); + return (int)(m_adjust->page_increment+0.5); } int wxScrollBar::GetRange() const { - return (int)(m_adjust->upper+0.5); + return (int)(m_adjust->upper+0.5); } 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; - - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + if (m_isScrolling) return; + + float fpos = (float)viewStart; + m_oldPos = fpos; + if (fabs(fpos-m_adjust->value) < 0.2) return; + m_adjust->value = fpos; + + gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust), + (GtkSignalFunc) gtk_scrollbar_callback, + (gpointer) this ); + + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + + gtk_signal_connect( GTK_OBJECT(m_adjust), + "value_changed", + (GtkSignalFunc) gtk_scrollbar_callback, + (gpointer) 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)) - { - SetThumbPosition( 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" ); + 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)) + { + SetThumbPosition( 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" ); } -// Backward compatibility -int wxScrollBar::GetValue(void) const +/* Backward compatibility */ +int wxScrollBar::GetValue() const { - return GetThumbPosition(); + return GetThumbPosition(); } void wxScrollBar::SetValue( int viewStart ) { - SetThumbPosition( viewStart ); + 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 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); + return (int)(m_adjust->upper+0.5); } int wxScrollBar::GetObjectLength() const { - return (int)(m_adjust->page_size+0.5); + return (int)(m_adjust->page_size+0.5); } 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 ); + 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 ); + 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 ); } void wxScrollBar::SetViewLength( int viewLength ) { - 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 ); + 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 ); } bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window ) { - 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) ); + GtkRange *range = GTK_RANGE(m_widget); + return ( (window == GTK_WIDGET(range)->window) +#ifndef __WXGTK20__ + || (window == range->trough) + || (window == range->slider) + || (window == range->step_forw) + || (window == range->step_back) +#endif // GTK+ 1.x + ); } void wxScrollBar::ApplyWidgetStyle() { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); +} + +wxSize wxScrollBar::DoGetBestSize() const +{ + return wxControl::DoGetBestSize(); } +#endif