X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acfd422afac254f4356904275656c0c15685fa1e..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/gtk/scrolbar.cpp?ds=sidebyside diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index 5c9ddc9eb5..df1cba34af 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/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,12 +12,18 @@ #pragma implementation "scrolbar.h" #endif +#include "wx/defs.h" + +#if wxUSE_SCROLLBAR + #include "wx/scrolbar.h" + #include "wx/utils.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -33,45 +39,36 @@ extern bool g_isIdle; 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 ) +static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win ) { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; if (g_blockEventsOnDrag) return; - float diff = win->m_adjust->value - win->m_oldPos; - if (fabs(diff) < 0.2) return; - win->m_oldPos = win->m_adjust->value; - - 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; - } + float diff = adjust->value - win->m_oldPos; + if (fabs(diff) < sensitivity) return; + + win->m_oldPos = adjust->value; + + GtkRange *range = GTK_RANGE( win->m_widget ); - int value = (int)(win->m_adjust->value+0.5); + wxEventType command = wxEVT_SCROLL_THUMBTRACK; + if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLL_LINEUP; + else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLL_LINEDOWN; + else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP; + else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLL_PAGEDOWN; + + double dvalue = adjust->value; + int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); - int orient = wxHORIZONTAL; - if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL; + int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; wxScrollEvent event( command, win->GetId(), value, orient ); event.SetEventObject( win ); @@ -88,14 +85,15 @@ 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 ) { if (g_isIdle) wxapp_install_idle_handler(); - win->m_isScrolling = TRUE; // g_blockEventsOnScroll = TRUE; doesn't work in DialogEd + + win->m_isScrolling = (gdk_event->window == widget->slider); return FALSE; } @@ -106,15 +104,25 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), GdkEventButton *WXUNUSED(gdk_event), - wxScrollBar *win ) + wxScrollBar *win ) { if (g_isIdle) wxapp_install_idle_handler(); - - win->m_isScrolling = FALSE; + // g_blockEventsOnScroll = FALSE; - gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" ); + if (win->m_isScrolling) + { + wxEventType command = wxEVT_SCROLL_THUMBRELEASE; + int value = (int)ceil(win->m_adjust->value); + int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; + + wxScrollEvent event( command, value, dir ); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); + } + win->m_isScrolling = FALSE; + return FALSE; } @@ -124,7 +132,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) -wxScrollBar::~wxScrollBar(void) +wxScrollBar::~wxScrollBar() { } @@ -135,37 +143,38 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, m_needParent = TRUE; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + 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_hscrollbar_new( (GtkAdjustment *) NULL ); - else + 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 ); + (GtkSignalFunc) gtk_scrollbar_callback, + (gpointer) this ); gtk_signal_connect( GTK_OBJECT(m_widget), "button_press_event", (GtkSignalFunc)gtk_scrollbar_button_press_callback, - (gpointer) this ); + (gpointer) this ); gtk_signal_connect( GTK_OBJECT(m_widget), "button_release_event", (GtkSignalFunc)gtk_scrollbar_button_release_callback, - (gpointer) this ); + (gpointer) this ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -176,9 +185,10 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, 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 @@ -205,7 +215,16 @@ void wxScrollBar::SetThumbPosition( int viewStart ) 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, @@ -237,7 +256,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page } /* Backward compatibility */ -int wxScrollBar::GetValue(void) const +int wxScrollBar::GetValue() const { return GetThumbPosition(); } @@ -299,9 +318,9 @@ 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) ); + (window == range->slider) || + (window == range->step_forw) || + (window == range->step_back) ); } void wxScrollBar::ApplyWidgetStyle() @@ -310,3 +329,4 @@ void wxScrollBar::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); } +#endif