Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scrolling fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-02-06 12:11:19 +00:00
parent 790ad94f70
commit 2a23d36334
4 changed files with 130 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/scrolbar.cpp
View File

@@ -82,14 +82,15 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
// "button_press_event" from slider // "button_press_event" from slider
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event), GdkEventButton *gdk_event,
wxScrollBar *win ) wxScrollBar *win )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
win->m_isScrolling = TRUE;
// g_blockEventsOnScroll = TRUE; doesn't work in DialogEd // g_blockEventsOnScroll = TRUE; doesn't work in DialogEd
win->m_isScrolling = (gdk_event->window == widget->slider);
return FALSE; return FALSE;
} }
@@ -104,20 +105,22 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
wxASSERT( win->m_isScrolling );
win->m_isScrolling = FALSE;
// g_blockEventsOnScroll = FALSE; // g_blockEventsOnScroll = FALSE;
wxEventType command = wxEVT_SCROLL_THUMBTRACK; if (win->m_isScrolling)
int value = (int)ceil(win->m_adjust->value); {
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; wxEventType command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)ceil(win->m_adjust->value);
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
wxScrollEvent event( command, value, dir ); wxScrollEvent event( command, value, dir );
event.SetScrolling( FALSE ); event.SetScrolling( FALSE );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
}
win->m_isScrolling = FALSE;
return FALSE; return FALSE;
} }
@@ -209,7 +212,16 @@ void wxScrollBar::SetThumbPosition( int viewStart )
if (fabs(fpos-m_adjust->value) < 0.2) return; if (fabs(fpos-m_adjust->value) < 0.2) return;
m_adjust->value = fpos; 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_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, void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,

70
src/gtk/window.cpp
View File

@@ -1581,6 +1581,7 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindow *win )
// "changed" from m_vAdjust // "changed" from m_vAdjust
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/*
static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1598,11 +1599,13 @@ static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "changed" from m_hAdjust // "changed" from m_hAdjust
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/*
static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1620,13 +1623,14 @@ static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "button_press_event" from scrollbar // "button_press_event" from scrollbar
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event), GdkEventButton *gdk_event,
wxWindow *win) wxWindow *win)
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1634,13 +1638,8 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
// don't test here as we can release the mouse while being over
// a different window than the slider
//
// if (gdk_event->window != widget->slider) return FALSE;
g_blockEventsOnScroll = TRUE; g_blockEventsOnScroll = TRUE;
win->m_isScrolling = TRUE; win->m_isScrolling = (gdk_event->window == widget->slider);
return FALSE; return FALSE;
} }
@@ -1655,38 +1654,39 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
// don't test here as we can release the mouse while being over // don't test here as we can release the mouse while being over
// a different window than the slider // a different window than the slider
// //
// if (gdk_event->window != widget->slider) return FALSE; // if (gdk_event->window != widget->slider) return FALSE;
wxASSERT( win->m_isScrolling );
g_blockEventsOnScroll = FALSE; g_blockEventsOnScroll = FALSE;
win->m_isScrolling = FALSE;
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK; if (win->m_isScrolling)
int value = -1; {
int dir = -1; wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
int value = -1;
int dir = -1;
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget); GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
if (widget == GTK_RANGE(scrolledWindow->hscrollbar)) if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
{ {
value = (int)(win->m_hAdjust->value+0.5); value = (int)(win->m_hAdjust->value+0.5);
dir = wxHORIZONTAL; dir = wxHORIZONTAL;
} }
if (widget == GTK_RANGE(scrolledWindow->vscrollbar)) if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
{ {
value = (int)(win->m_vAdjust->value+0.5); value = (int)(win->m_vAdjust->value+0.5);
dir = wxVERTICAL; dir = wxVERTICAL;
}
wxScrollWinEvent event( command, value, dir );
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
} }
wxScrollWinEvent event( command, value, dir ); win->m_isScrolling = FALSE;
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE; return FALSE;
} }
@@ -2119,10 +2119,12 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
(GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
/*
gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed", gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed", gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
*/
gtk_widget_show( m_wxwindow ); gtk_widget_show( m_wxwindow );
@@ -3333,23 +3335,31 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
if (orient == wxHORIZONTAL) if (orient == wxHORIZONTAL)
{ {
/*
gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust), gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
*/
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" ); gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
/*
gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed", gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
*/
} }
else else
{ {
/*
gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust), gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
*/
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" ); gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
/*
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "changed", gtk_signal_connect( GTK_OBJECT(m_vAdjust), "changed",
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
*/
} }
} }

38
src/gtk1/scrolbar.cpp
View File

@@ -82,14 +82,15 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
// "button_press_event" from slider // "button_press_event" from slider
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event), GdkEventButton *gdk_event,
wxScrollBar *win ) wxScrollBar *win )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
win->m_isScrolling = TRUE;
// g_blockEventsOnScroll = TRUE; doesn't work in DialogEd // g_blockEventsOnScroll = TRUE; doesn't work in DialogEd
win->m_isScrolling = (gdk_event->window == widget->slider);
return FALSE; return FALSE;
} }
@@ -104,20 +105,22 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
wxASSERT( win->m_isScrolling );
win->m_isScrolling = FALSE;
// g_blockEventsOnScroll = FALSE; // g_blockEventsOnScroll = FALSE;
wxEventType command = wxEVT_SCROLL_THUMBTRACK; if (win->m_isScrolling)
int value = (int)ceil(win->m_adjust->value); {
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL; wxEventType command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)ceil(win->m_adjust->value);
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
wxScrollEvent event( command, value, dir ); wxScrollEvent event( command, value, dir );
event.SetScrolling( FALSE ); event.SetScrolling( FALSE );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
}
win->m_isScrolling = FALSE;
return FALSE; return FALSE;
} }
@@ -209,7 +212,16 @@ void wxScrollBar::SetThumbPosition( int viewStart )
if (fabs(fpos-m_adjust->value) < 0.2) return; if (fabs(fpos-m_adjust->value) < 0.2) return;
m_adjust->value = fpos; 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_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, void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,

70
src/gtk1/window.cpp
View File

@@ -1581,6 +1581,7 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindow *win )
// "changed" from m_vAdjust // "changed" from m_vAdjust
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/*
static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1598,11 +1599,13 @@ static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "changed" from m_hAdjust // "changed" from m_hAdjust
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/*
static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1620,13 +1623,14 @@ static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "button_press_event" from scrollbar // "button_press_event" from scrollbar
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event), GdkEventButton *gdk_event,
wxWindow *win) wxWindow *win)
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1634,13 +1638,8 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
// don't test here as we can release the mouse while being over
// a different window than the slider
//
// if (gdk_event->window != widget->slider) return FALSE;
g_blockEventsOnScroll = TRUE; g_blockEventsOnScroll = TRUE;
win->m_isScrolling = TRUE; win->m_isScrolling = (gdk_event->window == widget->slider);
return FALSE; return FALSE;
} }
@@ -1655,38 +1654,39 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
// don't test here as we can release the mouse while being over // don't test here as we can release the mouse while being over
// a different window than the slider // a different window than the slider
// //
// if (gdk_event->window != widget->slider) return FALSE; // if (gdk_event->window != widget->slider) return FALSE;
wxASSERT( win->m_isScrolling );
g_blockEventsOnScroll = FALSE; g_blockEventsOnScroll = FALSE;
win->m_isScrolling = FALSE;
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK; if (win->m_isScrolling)
int value = -1; {
int dir = -1; wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
int value = -1;
int dir = -1;
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget); GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
if (widget == GTK_RANGE(scrolledWindow->hscrollbar)) if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
{ {
value = (int)(win->m_hAdjust->value+0.5); value = (int)(win->m_hAdjust->value+0.5);
dir = wxHORIZONTAL; dir = wxHORIZONTAL;
} }
if (widget == GTK_RANGE(scrolledWindow->vscrollbar)) if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
{ {
value = (int)(win->m_vAdjust->value+0.5); value = (int)(win->m_vAdjust->value+0.5);
dir = wxVERTICAL; dir = wxVERTICAL;
}
wxScrollWinEvent event( command, value, dir );
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
} }
wxScrollWinEvent event( command, value, dir ); win->m_isScrolling = FALSE;
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE; return FALSE;
} }
@@ -2119,10 +2119,12 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
(GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
/*
gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed", gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed", gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
*/
gtk_widget_show( m_wxwindow ); gtk_widget_show( m_wxwindow );
@@ -3333,23 +3335,31 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
if (orient == wxHORIZONTAL) if (orient == wxHORIZONTAL)
{ {
/*
gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust), gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
*/
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" ); gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
/*
gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed", gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
(GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
*/
} }
else else
{ {
/*
gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust), gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
*/
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" ); gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
/*
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "changed", gtk_signal_connect( GTK_OBJECT(m_vAdjust), "changed",
(GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
*/
} }
} }