/////////////////////////////////////////////////////////////////////////////
-// Name: generic/scrolwin.cpp
+// Name: gtk/scrolwin.cpp
// Purpose: wxScrolledWindow implementation
// Author: Julian Smart
// Modified by:
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnScroll;
//-----------------------------------------------------------------------------
// idle system
win->GtkHScroll( adjust->value );
}
+//-----------------------------------------------------------------------------
+// "button_press_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+ GdkEventButton *gdk_event,
+ wxWindowGTK *win)
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ g_blockEventsOnScroll = TRUE;
+ win->m_isScrolling = (gdk_event->window == widget->slider);
+
+ return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
+ GdkEventButton *WXUNUSED(gdk_event),
+ wxWindowGTK *win)
+{
+// 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 = FALSE;
+
+ if (win->m_isScrolling)
+ {
+ wxEventType command = wxEVT_SCROLLWIN_THUMBRELEASE;
+ int value = -1;
+ int dir = -1;
+
+ GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+ if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
+ {
+ value = (int)(win->m_hAdjust->value+0.5);
+ dir = wxHORIZONTAL;
+ }
+ if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
+ {
+ value = (int)(win->m_vAdjust->value+0.5);
+ dir = wxVERTICAL;
+ }
+
+ wxScrollWinEvent event( command, value, dir );
+ event.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( event );
+ }
+
+ win->m_isScrolling = FALSE;
+
+ return FALSE;
+}
+
//-----------------------------------------------------------------------------
// InsertChild for wxScrolledWindow
//-----------------------------------------------------------------------------
static void wxInsertChildInScrolledWindow( wxWindow* parent, wxWindow* child )
{
- /* the window might have been scrolled already, do we
- have to adapt the position */
+ // The window might have been scrolled already, do we
+ // have to adapt the position.
GtkPizza *pizza = GTK_PIZZA(parent->m_wxwindow);
child->m_x += pizza->xoffset;
child->m_y += pizza->yoffset;
// wxScrolledWindow creation
// ----------------------------------------------------------------------------
-wxScrolledWindow::wxScrolledWindow()
+void wxScrolledWindow::Init()
{
m_xScrollPixelsPerLine = 0;
m_yScrollPixelsPerLine = 0;
m_targetWindow = (wxWindow*) NULL;
m_scaleX = 1.0;
m_scaleY = 1.0;
+ m_hasScrolling = TRUE;
}
bool wxScrolledWindow::Create(wxWindow *parent,
long style,
const wxString& name)
{
+ Init();
+
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
}
m_insertCallback = wxInsertChildInScrolledWindow;
-
- m_xScrollPixelsPerLine = 0;
- m_yScrollPixelsPerLine = 0;
- m_xScrollingEnabled = TRUE;
- m_yScrollingEnabled = TRUE;
- m_xScrollPosition = 0;
- m_yScrollPosition = 0;
- m_xScrollLines = 0;
- m_yScrollLines = 0;
- m_xScrollLinesPerPage = 0;
- m_yScrollLinesPerPage = 0;
m_targetWindow = this;
m_hAdjust->page_increment = 1.0;
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
- // these handlers get notified when screen updates are required either when
- // scrolling or when the window size (and therefore scrollbar configuration)
- // has changed
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
- (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
- (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
+ // Handlers for new scrollbar values
+ GtkVConnectEvent();
+ GtkHConnectEvent();
+
+ // these handlers block mouse events to any window during scrolling such as
+ // motion events and prevent GTK and wxWindows from fighting over where the
+ // slider should be
+
+ gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
+ (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_press_event",
+ (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_release_event",
+ (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_release_event",
+ (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
gtk_widget_show( m_wxwindow );
if (m_parent)
m_parent->DoAddChild( this );
+
+ m_focusWidget = m_wxwindow;
PostCreation();
return TRUE;
}
-wxScrolledWindow::~wxScrolledWindow()
-{
-}
-
// ----------------------------------------------------------------------------
// setting scrolling parameters
// ----------------------------------------------------------------------------
int noUnitsX, int noUnitsY,
int xPos, int yPos, bool noRefresh )
{
+ int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
+ int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
+
m_xScrollPixelsPerLine = pixelsPerUnitX;
m_yScrollPixelsPerLine = pixelsPerUnitY;
- m_xScrollPosition = xPos;
- m_yScrollPosition = yPos;
m_xScrollLines = noUnitsX;
m_yScrollLines = noUnitsY;
-
+ m_xScrollPosition = xPos;
+ m_yScrollPosition = yPos;
+
m_hAdjust->lower = 0.0;
m_hAdjust->upper = noUnitsX;
m_hAdjust->value = xPos;
m_vAdjust->page_increment = 2.0;
AdjustScrollbars();
+
+ if (!noRefresh)
+ {
+ int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
+ int new_y = m_yScrollPixelsPerLine * m_yScrollPosition;
+
+ m_targetWindow->ScrollWindow( old_x-new_x, old_y-new_y );
+ }
}
void wxScrolledWindow::AdjustScrollbars()
{
int w, h;
m_targetWindow->GetClientSize( &w, &h );
-
+
if (m_xScrollPixelsPerLine == 0)
m_hAdjust->page_size = 1.0;
else
m_hAdjust->page_size = (w / m_xScrollPixelsPerLine);
-
+
if (m_yScrollPixelsPerLine == 0)
m_vAdjust->page_size = 1.0;
else
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
-
+
m_xScrollLinesPerPage = (int)(m_hAdjust->page_size + 0.5);
m_yScrollLinesPerPage = (int)(m_vAdjust->page_size + 0.5);
-
+
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
}
// target window handling
// ----------------------------------------------------------------------------
-void wxScrolledWindow::SetTargetWindow( wxWindow *target )
+void wxScrolledWindow::SetTargetWindow( wxWindow *target, bool WXUNUSED(pushEventHandler) )
{
wxASSERT_MSG( target, wxT("target window must not be NULL") );
m_targetWindow = target;
if ((x_pos != -1) && (m_xScrollPixelsPerLine))
{
+ int max = (int)(m_hAdjust->upper - m_hAdjust->page_size + 0.5);
+ if (max < 0) max = 0;
+ if (x_pos > max) x_pos = max;
+ if (x_pos < 0) x_pos = 0;
+
int old_x = m_xScrollPosition;
m_xScrollPosition = x_pos;
m_hAdjust->value = x_pos;
-
- wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
- wxScrollWinEvent event( command, m_xScrollPosition, wxHORIZONTAL );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
-
+
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
-
+
+ // Just update the scrollbar, don't send any wxWindows event
+ GtkHDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
+ GtkHConnectEvent();
}
-
+
if ((y_pos != -1) && (m_yScrollPixelsPerLine))
{
+ int max = (int)(m_vAdjust->upper - m_vAdjust->page_size + 0.5);
+ if (max < 0) max = 0;
+ if (y_pos > max) y_pos = max;
+ if (y_pos < 0) y_pos = 0;
+
int old_y = m_yScrollPosition;
m_yScrollPosition = y_pos;
m_vAdjust->value = y_pos;
-
- wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
- wxScrollWinEvent event( command, m_yScrollPosition, wxVERTICAL );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
-
+
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
-
+
+ // Just update the scrollbar, don't send any wxWindows event
+ GtkVDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+ GtkVConnectEvent();
}
}
if (m_yScrollPixelsPerLine == 0)
return;
-
+
int y_pos = (int)(value+0.5);
-
+
if (y_pos == m_yScrollPosition)
return;
-
+
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
GtkRange *range = GTK_RANGE(scrolledWindow->vscrollbar);
-
+
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP;
else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLLWIN_LINEDOWN;
wxScrollWinEvent event( command, y_pos, wxVERTICAL );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
-
-/*
- int old_y = m_yScrollPosition;
- m_yScrollPosition = y_pos;
-
- m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
-*/
}
void wxScrolledWindow::GtkHScroll( float value )
{
if (!m_targetWindow)
return;
-
+
if (m_xScrollPixelsPerLine == 0)
return;
-
+
int x_pos = (int)(value+0.5);
if (x_pos == m_xScrollPosition)
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
GtkRange *range = GTK_RANGE(scrolledWindow->hscrollbar);
-
+
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP;
else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLLWIN_LINEDOWN;
wxScrollWinEvent event( command, x_pos, wxHORIZONTAL );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
-
-/*
- int old_x = m_xScrollPosition;
- m_xScrollPosition = x_pos;
-
- m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
-*/
}
void wxScrolledWindow::EnableScrolling (bool x_scroll, bool y_scroll)
{
if (m_xScrollPixelsPerLine > 0)
{
- int w, h;
- m_targetWindow->GetClientSize(&w, &h);
-
- int noPositions = (int)(m_hAdjust->upper - m_hAdjust->page_size + 0.5);
- if (noPositions < 0) noPositions = 0;
+ int max = (int)(m_hAdjust->upper - m_hAdjust->page_size + 0.5);
+ if (max < 0) max = 0;
if ( (m_xScrollPosition + nScrollInc) < 0 )
nScrollInc = -m_xScrollPosition; // As -ve as we can go
- else if ( (m_xScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
+ else if ( (m_xScrollPosition + nScrollInc) > max )
+ nScrollInc = max - m_xScrollPosition; // As +ve as we can go
}
else
m_targetWindow->Refresh();
{
if (m_yScrollPixelsPerLine > 0)
{
- int w, h;
- m_targetWindow->GetClientSize(&w, &h);
-
- int noPositions = (int)(m_vAdjust->upper - m_vAdjust->page_size + 0.5);
- if (noPositions < 0) noPositions = 0;
+ int max = (int)(m_vAdjust->upper - m_vAdjust->page_size + 0.5);
+ if (max < 0) max = 0;
if ( (m_yScrollPosition + nScrollInc) < 0 )
nScrollInc = -m_yScrollPosition; // As -ve as we can go
- else if ( (m_yScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
+ else if ( (m_yScrollPosition + nScrollInc) > max )
+ nScrollInc = max - m_yScrollPosition; // As +ve as we can go
}
else
m_targetWindow->Refresh();
return nScrollInc;
}
-void wxScrolledWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
+void wxScrolledWindow::SetScrollPos( int orient, int pos, bool refresh )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
if (orient == wxHORIZONTAL)
{
- float fpos = (float)pos;
- if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
+ int max = (int)(m_hAdjust->upper - m_hAdjust->page_size + 0.5);
+ if (max < 0) max = 0;
+
+ if (pos > max) pos = 0;
+ if (pos < 0) pos = 0;
- if (fabs(fpos-m_hAdjust->value) < 0.2) return;
- m_hAdjust->value = fpos;
+ if (pos == (int)(m_hAdjust->value+0.5)) return;
+ m_hAdjust->value = pos;
}
else
{
- float fpos = (float)pos;
- if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
+ int max = (int)(m_vAdjust->upper - m_vAdjust->page_size + 0.5);
+ if (max < 0) max = 0;
- if (fabs(fpos-m_vAdjust->value) < 0.2) return;
- m_vAdjust->value = fpos;
+ if (pos > max) pos = 0;
+ if (pos < 0) pos = 0;
+
+ if (pos == (int)(m_vAdjust->value+0.5)) return;
+ m_vAdjust->value = pos;
}
if (m_wxwindow->window)
{
if (orient == wxHORIZONTAL)
{
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
- (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
-
+ // Just update the scrollbar, don't send any wxWindows event
+ GtkHDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
- (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
+ GtkHConnectEvent();
}
else
{
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
- (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
-
+ // Just update the scrollbar, don't send any wxWindows event
+ GtkVDisconnectEvent();
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
-
- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
- (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
+ GtkVConnectEvent();
}
}
}
+void wxScrolledWindow::GtkVConnectEvent()
+{
+ gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
+ (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
+}
+
+void wxScrolledWindow::GtkHConnectEvent()
+{
+ gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
+ (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
+}
+
+void wxScrolledWindow::GtkHDisconnectEvent()
+{
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
+ (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
+}
+
+void wxScrolledWindow::GtkVDisconnectEvent()
+{
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
+ (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
+}
+
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
szy = -1;
}
+ int xScrollOld = GetScrollPos(wxHORIZONTAL),
+ yScrollOld = GetScrollPos(wxVERTICAL);
+
int dsty;
switch ( event.KeyCode() )
{
default:
// not for us
event.Skip();
+ return;
+ }
+
+ int xScroll = GetScrollPos(wxHORIZONTAL);
+ if ( xScroll != xScrollOld )
+ {
+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBTRACK, xScroll,
+ wxHORIZONTAL);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
+
+ int yScroll = GetScrollPos(wxVERTICAL);
+ if ( yScroll != yScrollOld )
+ {
+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBTRACK, yScroll,
+ wxVERTICAL);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
}
}
+
projects / wxWidgets.git / blobdiff