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

more fixes to target window scrolling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-02 15:57:36 +00:00
parent af4088f1be
commit 5f3286d17d
3 changed files with 49 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
samples/scrollsub/scrollsub.cpp
View File

@@ -55,12 +55,12 @@ class MyTopLabels: public wxWindow
public: public:
MyTopLabels() {} MyTopLabels() {}
MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); MyTopLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size );
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );
private: private:
wxScrolledWindow *m_owner; wxScrolledWindow *m_owner;
DECLARE_DYNAMIC_CLASS(MyTopLabels) DECLARE_DYNAMIC_CLASS(MyTopLabels)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -72,12 +72,12 @@ class MyRightLabels: public wxWindow
public: public:
MyRightLabels() {} MyRightLabels() {}
MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ); MyRightLabels( wxScrolledWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size );
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );
private: private:
wxScrolledWindow *m_owner; wxScrolledWindow *m_owner;
DECLARE_DYNAMIC_CLASS(MyRightLabels) DECLARE_DYNAMIC_CLASS(MyRightLabels)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -150,25 +150,25 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
MyRightLabels *right = new MyRightLabels( this, -1, wxDefaultPosition, wxSize(60,-1) ); MyRightLabels *right = new MyRightLabels( this, -1, wxDefaultPosition, wxSize(60,-1) );
m_canvas = new MyCanvas( this, top, right, -1, wxDefaultPosition, wxDefaultSize ); m_canvas = new MyCanvas( this, top, right, -1, wxDefaultPosition, wxDefaultSize );
SetTargetWindow( m_canvas ); SetTargetWindow( m_canvas );
SetBackgroundColour( wxT("WHEAT") ); SetBackgroundColour( wxT("WHEAT") );
SetCursor( wxCursor( wxCURSOR_HAND ) ); SetCursor( wxCursor( wxCURSOR_HAND ) );
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
topsizer->Add( 60,25 ); topsizer->Add( 60,25 );
topsizer->Add( top, 1 ); topsizer->Add( top, 1, wxEXPAND );
mainsizer->Add( topsizer, 0, wxEXPAND ); mainsizer->Add( topsizer, 0, wxEXPAND );
wxBoxSizer *middlesizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *middlesizer = new wxBoxSizer( wxHORIZONTAL );
middlesizer->Add( right, 0, wxEXPAND ); middlesizer->Add( right, 0, wxEXPAND );
middlesizer->Add( m_canvas, 1, wxEXPAND ); middlesizer->Add( m_canvas, 1, wxEXPAND );
mainsizer->Add( middlesizer, 1, wxEXPAND ); mainsizer->Add( middlesizer, 1, wxEXPAND );
SetAutoLayout( TRUE ); SetAutoLayout( TRUE );
@@ -185,7 +185,7 @@ void MyScrolledWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
/* /*
wxSize size( GetClientSize() ); wxSize size( GetClientSize() );
long w,h; long w,h;
dc.GetTextExtent( wxT("Headline"), &w, &h ); dc.GetTextExtent( wxT("Headline"), &w, &h );
@@ -257,15 +257,15 @@ MyCanvas::MyCanvas( wxScrolledWindow *parent, MyTopLabels *top, MyRightLabels *r
m_owner = parent; m_owner = parent;
m_topLabels = top; m_topLabels = top;
m_rightLabels = right; m_rightLabels = right;
(void)new wxButton( this, -1, "Hallo I", wxPoint(0,50), wxSize(100,25) ); (void)new wxButton( this, -1, "Hallo I", wxPoint(0,50), wxSize(100,25) );
(void)new wxButton( this, -1, "Hallo II", wxPoint(200,50), wxSize(100,25) ); (void)new wxButton( this, -1, "Hallo II", wxPoint(200,50), wxSize(100,25) );
(void)new wxTextCtrl( this, -1, "Text I", wxPoint(0,100), wxSize(100,25) ); (void)new wxTextCtrl( this, -1, "Text I", wxPoint(0,100), wxSize(100,25) );
(void)new wxTextCtrl( this, -1, "Text II", wxPoint(200,100), wxSize(100,25) ); (void)new wxTextCtrl( this, -1, "Text II", wxPoint(200,100), wxSize(100,25) );
SetBackgroundColour( wxT("WHEAT") ); SetBackgroundColour( wxT("WHEAT") );
SetCursor( wxCursor( wxCURSOR_IBEAM ) ); SetCursor( wxCursor( wxCURSOR_IBEAM ) );
} }
@@ -279,27 +279,27 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
m_owner->PrepareDC( dc ); m_owner->PrepareDC( dc );
dc.SetPen( *wxBLACK_PEN ); dc.SetPen( *wxBLACK_PEN );
// OK, let's assume we are a grid control and we have two // OK, let's assume we are a grid control and we have two
// grid cells. Here in OnPaint we want to know which cell // grid cells. Here in OnPaint we want to know which cell
// to redraw so that we prevent redrawing cells that don't // to redraw so that we prevent redrawing cells that don't
// need to get redrawn. We have one cell at (0,0) and one // need to get redrawn. We have one cell at (0,0) and one
// more at (200,0), both having a size of (100,25). // more at (200,0), both having a size of (100,25).
// We can query how much the window has been scrolled // We can query how much the window has been scrolled
// by calling CalcUnscrolledPosition() // by calling CalcUnscrolledPosition()
int scroll_x = 0; int scroll_x = 0;
int scroll_y = 0; int scroll_y = 0;
m_owner->CalcUnscrolledPosition( scroll_x, scroll_y, &scroll_x, &scroll_y ); m_owner->CalcUnscrolledPosition( scroll_x, scroll_y, &scroll_x, &scroll_y );
// We also need to know the size of the window to see which // We also need to know the size of the window to see which
// cells are completely hidden and not get redrawn // cells are completely hidden and not get redrawn
int size_x = 0; int size_x = 0;
int size_y = 0; int size_y = 0;
GetClientSize( &size_x, &size_y ); GetClientSize( &size_x, &size_y );
// First cell: (0,0)(100,25) // First cell: (0,0)(100,25)
// It it on screen? // It it on screen?
if ((0+100-scroll_x > 0) && (0+25-scroll_y > 0) && if ((0+100-scroll_x > 0) && (0+25-scroll_y > 0) &&
@@ -313,8 +313,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.DrawText( "First Cell", 5, 5 ); dc.DrawText( "First Cell", 5, 5 );
} }
} }
// Second cell: (0,200)(100,25) // Second cell: (0,200)(100,25)
// It it on screen? // It it on screen?
if ((200+100-scroll_x > 0) && (0+25-scroll_y > 0) && if ((200+100-scroll_x > 0) && (0+25-scroll_y > 0) &&
@@ -328,7 +328,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.DrawText( "Second Cell", 205, 5 ); dc.DrawText( "Second Cell", 205, 5 );
} }
} }
} }
void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect ) void MyCanvas::ScrollWindow( int dx, int dy, const wxRect *rect )
@@ -372,11 +372,11 @@ MyFrame::MyFrame()
m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) ); m_scrolled = new MyScrolledWindow( this, -1, wxDefaultPosition, wxSize(100,100) );
m_scrolled->SetScrollbars( 10, 10, 50, 100 ); m_scrolled->SetScrollbars( 10, 10, 50, 100 );
m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE ); m_log = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) ); wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
delete old_log; delete old_log;
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
topsizer->Add( m_scrolled, 1, wxEXPAND ); topsizer->Add( m_scrolled, 1, wxEXPAND );
topsizer->Add( m_log, 0, wxEXPAND ); topsizer->Add( m_log, 0, wxEXPAND );

20
src/generic/scrlwing.cpp
View File

@@ -454,12 +454,12 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
if (orient == wxHORIZONTAL) if (orient == wxHORIZONTAL)
{ {
m_xScrollPosition += nScrollInc; m_xScrollPosition += nScrollInc;
m_targetWindow->SetScrollPos(wxHORIZONTAL, m_xScrollPosition); m_win->SetScrollPos(wxHORIZONTAL, m_xScrollPosition);
} }
else else
{ {
m_yScrollPosition += nScrollInc; m_yScrollPosition += nScrollInc;
m_targetWindow->SetScrollPos(wxVERTICAL, m_yScrollPosition); m_win->SetScrollPos(wxVERTICAL, m_yScrollPosition);
} }
bool needsRefresh = FALSE; bool needsRefresh = FALSE;
@@ -624,14 +624,14 @@ void wxScrollHelper::AdjustScrollbars()
m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition); m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition);
m_xScrollPosition = wxMax( 0, m_xScrollPosition ); m_xScrollPosition = wxMax( 0, m_xScrollPosition );
m_targetWindow->SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines); m_win->SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
// The amount by which we scroll when paging // The amount by which we scroll when paging
SetScrollPageSize(wxHORIZONTAL, noPagePositions); SetScrollPageSize(wxHORIZONTAL, noPagePositions);
} }
else else
{ {
m_xScrollPosition = 0; m_xScrollPosition = 0;
m_targetWindow->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE); m_win->SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE);
} }
if (m_yScrollLines > 0) if (m_yScrollLines > 0)
@@ -648,14 +648,14 @@ void wxScrollHelper::AdjustScrollbars()
m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition ); m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
m_yScrollPosition = wxMax( 0, m_yScrollPosition ); m_yScrollPosition = wxMax( 0, m_yScrollPosition );
m_targetWindow->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines); m_win->SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, m_yScrollLines);
// The amount by which we scroll when paging // The amount by which we scroll when paging
SetScrollPageSize(wxVERTICAL, noPagePositions); SetScrollPageSize(wxVERTICAL, noPagePositions);
} }
else else
{ {
m_yScrollPosition = 0; m_yScrollPosition = 0;
m_targetWindow->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); m_win->SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE);
} }
if (oldXScroll != m_xScrollPosition) if (oldXScroll != m_xScrollPosition)
@@ -747,7 +747,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
m_xScrollPosition = wxMax( 0, m_xScrollPosition ); m_xScrollPosition = wxMax( 0, m_xScrollPosition );
if (old_x != m_xScrollPosition) { if (old_x != m_xScrollPosition) {
m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition ); m_win->SetScrollPos( wxHORIZONTAL, m_xScrollPosition );
m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0, m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0,
GetRect() ); GetRect() );
} }
@@ -768,7 +768,7 @@ void wxScrollHelper::Scroll( int x_pos, int y_pos )
m_yScrollPosition = wxMax( 0, m_yScrollPosition ); m_yScrollPosition = wxMax( 0, m_yScrollPosition );
if (old_y != m_yScrollPosition) { if (old_y != m_yScrollPosition) {
m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition ); m_win->SetScrollPos( wxVERTICAL, m_yScrollPosition );
m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine, m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine,
GetRect() ); GetRect() );
} }
@@ -827,8 +827,8 @@ void wxScrollHelper::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) cons
void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event)) void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
{ {
#if wxUSE_CONSTRAINTS #if wxUSE_CONSTRAINTS
if ( m_targetWindow->GetAutoLayout() ) if ( m_win->GetAutoLayout() )
m_targetWindow->Layout(); m_win->Layout();
#endif #endif
AdjustScrollbars(); AdjustScrollbars();

31
src/msw/window.cpp
View File

@@ -825,36 +825,23 @@ int wxWindowMSW::GetScrollThumb(int orient) const
void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh) void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh)
{ {
HWND hWnd = GetHwnd();
wxCHECK_RET( hWnd, _T("SetScrollPos: no HWND") );
int dir = orient == wxHORIZONTAL ? SB_HORZ : SB_VERT;
#if defined(__WIN95__) #if defined(__WIN95__)
SCROLLINFO info; SCROLLINFO info;
int dir;
if ( orient == wxHORIZONTAL ) {
dir = SB_HORZ;
} else {
dir = SB_VERT;
}
info.cbSize = sizeof(SCROLLINFO); info.cbSize = sizeof(SCROLLINFO);
info.nPage = 0; info.nPage = 0;
info.nMin = 0; info.nMin = 0;
info.nPos = pos; info.nPos = pos;
info.fMask = SIF_POS; info.fMask = SIF_POS;
HWND hWnd = GetHwnd(); ::SetScrollInfo(hWnd, dir, &info, refresh);
if ( hWnd ) #else // !__WIN95__
::SetScrollInfo(hWnd, dir, &info, refresh); ::SetScrollPos(hWnd, dir, pos, refresh);
#else #endif // __WIN95__/!__WIN95__
int wOrient;
if ( orient == wxHORIZONTAL )
wOrient = SB_HORZ;
else
wOrient = SB_VERT;
HWND hWnd = GetHwnd();
if ( hWnd )
::SetScrollPos(hWnd, wOrient, pos, refresh);
#endif
} }
// New function that will replace some of the above. // New function that will replace some of the above.