// Name: gtk/scrolwin.cpp
// Purpose: wxScrolledWindow implementation
// Author: Julian Smart
-// Modified by:
+// Modified by: Ron Lee
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
#include "wx/utils.h"
#include "wx/dcclient.h"
-#include "wx/gtk/scrolwin.h"
+#include "wx/scrolwin.h"
#include "wx/panel.h"
+#include "wx/sizer.h"
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
// ----------------------------------------------------------------------------
// "value_changed" from m_vAdjust
//-----------------------------------------------------------------------------
-static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust, wxScrolledWindow *win )
+static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust,
+ SCROLLBAR_CBACK_ARG
+ wxScrolledWindow *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
if (!win->m_hasVMT) return;
- win->GtkVScroll( adjust->value );
+ win->GtkVScroll( adjust->value,
+ GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->vscrollbar) );
}
//-----------------------------------------------------------------------------
// "value_changed" from m_hAdjust
//-----------------------------------------------------------------------------
-static void gtk_scrolled_window_hscroll_callback( GtkAdjustment *adjust, wxScrolledWindow *win )
+static void gtk_scrolled_window_hscroll_callback( GtkAdjustment *adjust,
+ SCROLLBAR_CBACK_ARG
+ wxScrolledWindow *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
if (g_blockEventsOnDrag) return;
if (!win->m_hasVMT) return;
- win->GtkHScroll( adjust->value );
+ win->GtkHScroll( adjust->value,
+ GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->hscrollbar) );
}
//-----------------------------------------------------------------------------
wxapp_install_idle_handler();
g_blockEventsOnScroll = TRUE;
+
+ // 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;
}
m_yScrollingEnabled = TRUE;
m_xScrollPosition = 0;
m_yScrollPosition = 0;
- m_xScrollLines = 0;
- m_yScrollLines = 0;
m_xScrollLinesPerPage = 0;
m_yScrollLinesPerPage = 0;
m_targetWindow = (wxWindow*) NULL;
m_vAdjust->upper = 1.0;
m_vAdjust->value = 0.0;
m_vAdjust->step_increment = 1.0;
- m_vAdjust->page_increment = 1.0;
+ m_vAdjust->page_increment = 2.0;
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
m_hAdjust->lower = 0.0;
m_hAdjust->upper = 1.0;
m_hAdjust->value = 0.0;
m_hAdjust->step_increment = 1.0;
- m_hAdjust->page_increment = 1.0;
+ m_hAdjust->page_increment = 2.0;
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
// Handlers for new scrollbar values
if (m_parent)
m_parent->DoAddChild( this );
-
+
m_focusWidget = m_wxwindow;
PostCreation();
// setting scrolling parameters
// ----------------------------------------------------------------------------
+void wxScrolledWindow::DoSetVirtualSize( int x, int y )
+{
+ wxPanel::DoSetVirtualSize( x, y );
+ AdjustScrollbars();
+
+#if wxUSE_CONSTRAINTS
+ if (GetAutoLayout())
+ Layout();
+#endif
+}
+
/*
* pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
* noUnitsX/noUnitsY: : no. units per scrollbar
*/
-void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
- int noUnitsX, int noUnitsY,
- int xPos, int yPos, bool noRefresh )
+void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
+ 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_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_hAdjust->step_increment = 1.0;
- m_hAdjust->page_increment = 2.0;
+ m_hAdjust->value = m_xScrollPosition = xPos;
+ m_vAdjust->value = m_yScrollPosition = yPos;
+
+ m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
- m_vAdjust->lower = 0.0;
- m_vAdjust->upper = noUnitsY;
- m_vAdjust->value = yPos;
- m_vAdjust->step_increment = 1.0;
- 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 );
+
+ m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y );
}
}
void wxScrolledWindow::AdjustScrollbars()
{
int w, h;
+ int vw, vh;
+
m_targetWindow->GetClientSize( &w, &h );
+ m_targetWindow->GetVirtualSize( &vw, &vh );
if (m_xScrollPixelsPerLine == 0)
+ {
+ m_hAdjust->upper = 1.0;
m_hAdjust->page_size = 1.0;
+ }
else
+ {
+ m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
m_hAdjust->page_size = (w / m_xScrollPixelsPerLine);
+ // If the scrollbar hits the right side, move the window
+ // right to keep it from over extending.
+
+ if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper )
+ {
+ m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
+ m_xScrollPosition = (int)m_hAdjust->value;
+ }
+ }
+
if (m_yScrollPixelsPerLine == 0)
+ {
+ m_vAdjust->upper = 1.0;
m_vAdjust->page_size = 1.0;
+ }
else
+ {
+ m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
+ if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper )
+ {
+ m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
+ m_yScrollPosition = (int)m_vAdjust->value;
+ }
+ }
+
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_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;
-m_yScrollPosition * m_yScrollPixelsPerLine );
}
+void wxScrolledWindow::SetScrollRate( int xstep, int ystep )
+{
+ int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
+ int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
+
+ m_xScrollPixelsPerLine = xstep;
+ m_yScrollPixelsPerLine = ystep;
+
+ 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 );
+
+ AdjustScrollbars();
+}
+
void wxScrolledWindow::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
{
if ( x_unit )
void wxScrolledWindow::Scroll( int x_pos, int y_pos )
{
- if (!m_targetWindow)
- return;
+ wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
}
}
-void wxScrolledWindow::GtkVScroll( float value )
+// TODO: [VH]Scroll functions should be combined
+
+void wxScrolledWindow::GtkVScroll( float value, unsigned int scroll_type )
{
- if (!m_targetWindow)
- return;
+ wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
if (m_yScrollPixelsPerLine == 0)
return;
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;
- else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP;
- else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLLWIN_PAGEDOWN;
+ wxEventType command = GtkScrollWinTypeToWx(scroll_type);
wxScrollWinEvent event( command, y_pos, wxVERTICAL );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
}
-void wxScrolledWindow::GtkHScroll( float value )
+void wxScrolledWindow::GtkHScroll( float value, unsigned int scroll_type )
{
- if (!m_targetWindow)
- return;
+ wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
if (m_xScrollPixelsPerLine == 0)
return;
if (x_pos == m_xScrollPosition)
return;
- 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;
- else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP;
- else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLLWIN_PAGEDOWN;
+ wxEventType command = GtkScrollWinTypeToWx(scroll_type);
wxScrollWinEvent event( command, x_pos, wxHORIZONTAL );
event.SetEventObject( this );
m_yScrollingEnabled = y_scroll;
}
-void wxScrolledWindow::GetVirtualSize (int *x, int *y) const
-{
- if ( x )
- *x = m_xScrollPixelsPerLine * m_xScrollLines;
- if ( y )
- *y = m_yScrollPixelsPerLine * m_yScrollLines;
-}
-
// Where the current view starts from
void wxScrolledWindow::GetViewStart (int *x, int *y) const
{
*y = m_yScrollPosition;
}
-void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrolledWindow::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
{
if ( xx )
*xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
*yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
}
-void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrolledWindow::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
{
if ( xx )
*xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
if (event.GetEventType() == wxEVT_SCROLLWIN_BOTTOM)
{
if (orient == wxHORIZONTAL)
- nScrollInc = m_xScrollLines - m_xScrollPosition;
+ nScrollInc = GetVirtualSize().GetWidth() / m_xScrollPixelsPerLine - m_xScrollPosition;
else
- nScrollInc = m_yScrollLines - m_yScrollPosition;
+ nScrollInc = GetVirtualSize().GetHeight() / m_yScrollPixelsPerLine - m_yScrollPosition;
} else
if (event.GetEventType() == wxEVT_SCROLLWIN_LINEUP)
{
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") );
(GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
}
+bool wxScrolledWindow::Layout()
+{
+ if (GetSizer() && m_targetWindow == this)
+ {
+ // If we're the scroll target, take into account the
+ // virtual size and scrolled position of the window.
+
+ int x, y, w, h;
+ CalcScrolledPosition(0,0, &x,&y);
+ GetVirtualSize(&w, &h);
+ GetSizer()->SetDimension(x, y, w, h);
+ return TRUE;
+ }
+ else
+ return wxPanel::Layout(); // fall back to default for LayoutConstraints
+}
+
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
// Default OnSize resets scrollbars, if any
void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
{
-#if wxUSE_CONSTRAINTS
- if (GetAutoLayout())
- Layout();
-#endif
+ if( m_targetWindow != this )
+ m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
- AdjustScrollbars();
+ SetVirtualSize( GetClientSize() );
}
// This calls OnDraw, having adjusted the origin according to the current
}
}
+
+// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff