X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d80cd92ae2d648a9a11707502277e5c79f5f65b7..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/src/generic/scrolwin.cpp?ds=sidebyside diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp index 066e25a2f2..1a8af01547 100644 --- a/src/generic/scrolwin.cpp +++ b/src/generic/scrolwin.cpp @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -58,7 +58,7 @@ BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel) EVT_SCROLLWIN(wxScrolledWindow::OnScroll) EVT_SIZE(wxScrolledWindow::OnSize) EVT_PAINT(wxScrolledWindow::OnPaint) - EVT_KEY_DOWN(wxScrolledWindow::OnKeyDown) + EVT_CHAR(wxScrolledWindow::OnChar) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel) @@ -85,6 +85,7 @@ wxScrolledWindow::wxScrolledWindow() m_yScrollLinesPerPage = 0; m_scaleX = 1.0; m_scaleY = 1.0; + m_targetWindow = (wxWindow*) NULL; } bool wxScrolledWindow::Create(wxWindow *parent, @@ -106,10 +107,17 @@ bool wxScrolledWindow::Create(wxWindow *parent, m_yScrollLinesPerPage = 0; m_scaleX = 1.0; m_scaleY = 1.0; - + m_targetWindow = this; - return wxPanel::Create(parent, id, pos, size, style, name); + bool ok = wxPanel::Create(parent, id, pos, size, style, name); + +#ifdef __WXMSW__ + // we need to process arrows ourselves for scrolling + m_lDlgCode |= DLGC_WANTARROWS; +#endif // __WXMSW__ + + return ok; } wxScrolledWindow::~wxScrolledWindow() @@ -128,18 +136,22 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, int noUnitsY, int xPos, int yPos, bool noRefresh ) { + int xpos, ypos; + + CalcUnscrolledPosition(xPos, yPos, &xpos, &ypos); bool do_refresh = ( (noUnitsX != 0 && m_xScrollLines == 0) || - (noUnitsX < m_xScrollLines) || + (noUnitsX < m_xScrollLines && xpos > pixelsPerUnitX*noUnitsX) || + (noUnitsY != 0 && m_yScrollLines == 0) || - (noUnitsY < m_yScrollLines) || + (noUnitsY < m_yScrollLines && ypos > pixelsPerUnitY*noUnitsY) || (xPos != m_xScrollPosition) || - (yPos != m_yScrollPosition) || - (pixelsPerUnitX != m_xScrollPixelsPerLine) || - (pixelsPerUnitY != m_yScrollPixelsPerLine) + (yPos != m_yScrollPosition) +// (pixelsPerUnitX != m_xScrollPixelsPerLine) || +// (pixelsPerUnitY != m_yScrollPixelsPerLine) ); - + m_xScrollPixelsPerLine = pixelsPerUnitX; m_yScrollPixelsPerLine = pixelsPerUnitY; m_xScrollPosition = xPos; @@ -179,12 +191,12 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY, } #endif // Motif - + AdjustScrollbars(); - - if (do_refresh && !noRefresh) - m_targetWindow->Refresh(); - + + if (do_refresh && !noRefresh) + m_targetWindow->Refresh(); + #ifdef __WXMSW__ // GRG: if this turns out to be really necessary, we could // at least move it to the above if { ... } so that it is @@ -245,7 +257,7 @@ void wxScrolledWindow::OnScroll(wxScrollWinEvent& event) { m_yScrollPosition += nScrollInc; } - + if (orient == wxHORIZONTAL) { if (m_xScrollingEnabled) @@ -259,7 +271,7 @@ void wxScrolledWindow::OnScroll(wxScrollWinEvent& event) m_targetWindow->ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL); else m_targetWindow->Refresh(); - } + } #ifdef __WXMAC__ m_targetWindow->MacUpdateImmediately() ; #endif @@ -316,6 +328,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event) break; } case wxEVT_SCROLLWIN_THUMBTRACK: + case wxEVT_SCROLLWIN_THUMBRELEASE: { if (orient == wxHORIZONTAL) nScrollInc = pos - m_xScrollPosition; @@ -331,7 +344,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event) if (orient == wxHORIZONTAL) { - if (m_xScrollPixelsPerLine > 0) + if (m_xScrollPixelsPerLine > 0) { int w, h; m_targetWindow->GetClientSize(&w, &h); @@ -351,16 +364,16 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event) } else { - if (m_yScrollPixelsPerLine > 0) + if (m_yScrollPixelsPerLine > 0) { int w, h; m_targetWindow->GetClientSize(&w, &h); - + int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine; int noPositions = (int) ( ((nMaxHeight - h)/(double)m_yScrollPixelsPerLine) + 0.5 ); if (noPositions < 0) noPositions = 0; - + if ( (m_yScrollPosition + nScrollInc) < 0 ) nScrollInc = -m_yScrollPosition; // As -ve as we can go else if ( (m_yScrollPosition + nScrollInc) > noPositions ) @@ -378,20 +391,20 @@ void wxScrolledWindow::AdjustScrollbars() { int w, h; m_targetWindow->GetClientSize(&w, &h); - + int oldXScroll = m_xScrollPosition; int oldYScroll = m_yScrollPosition; if (m_xScrollLines > 0) { - // Calculate page size i.e. number of scroll units you get on the - // current client window + // Calculate page size i.e. number of scroll units you get on the + // current client window int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 ); if (noPagePositions < 1) noPagePositions = 1; // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero - m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition); + // the visible portion of it or if below zero + m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition); m_xScrollPosition = wxMax( 0, m_xScrollPosition ); SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines); @@ -399,20 +412,20 @@ void wxScrolledWindow::AdjustScrollbars() SetScrollPageSize(wxHORIZONTAL, noPagePositions); } else - { + { m_xScrollPosition = 0; - SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE); + SetScrollbar (wxHORIZONTAL, 0, 0, 0, FALSE); } - + if (m_yScrollLines > 0) { - // Calculate page size i.e. number of scroll units you get on the - // current client window + // Calculate page size i.e. number of scroll units you get on the + // current client window int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 ); if (noPagePositions < 1) noPagePositions = 1; // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero + // the visible portion of it or if below zero m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition ); m_yScrollPosition = wxMax( 0, m_yScrollPosition ); @@ -423,9 +436,9 @@ void wxScrolledWindow::AdjustScrollbars() else { m_yScrollPosition = 0; - SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); + SetScrollbar (wxVERTICAL, 0, 0, 0, FALSE); } - + if (oldXScroll != m_xScrollPosition) { if (m_xScrollingEnabled) @@ -433,7 +446,7 @@ void wxScrolledWindow::AdjustScrollbars() else m_targetWindow->Refresh(); } - + if (oldYScroll != m_yScrollPosition) { if (m_yScrollingEnabled) @@ -447,7 +460,7 @@ void wxScrolledWindow::AdjustScrollbars() // automatically change the origin according to the scroll position. void wxScrolledWindow::PrepareDC(wxDC& dc) { - dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine, + dc.SetDeviceOrigin( -m_xScrollPosition * m_xScrollPixelsPerLine, -m_yScrollPosition * m_yScrollPixelsPerLine ); dc.SetUserScale( m_scaleX, m_scaleY ); } @@ -497,54 +510,58 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize) */ void wxScrolledWindow::Scroll( int x_pos, int y_pos ) { - if (((x_pos == -1) || (x_pos == m_xScrollPosition)) && + if (!m_targetWindow) + return; + + if (((x_pos == -1) || (x_pos == m_xScrollPosition)) && ((y_pos == -1) || (y_pos == m_yScrollPosition))) return; - + int w, h; m_targetWindow->GetClientSize(&w, &h); - if (x_pos != -1) + if ((x_pos != -1) && (m_xScrollPixelsPerLine)) { int old_x = m_xScrollPosition; m_xScrollPosition = x_pos; - - // Calculate page size i.e. number of scroll units you get on the - // current client window + + // Calculate page size i.e. number of scroll units you get on the + // current client window int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 ); if (noPagePositions < 1) noPagePositions = 1; // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero + // the visible portion of it or if below zero m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition ); m_xScrollPosition = wxMax( 0, m_xScrollPosition ); - + + if (old_x == m_xScrollPosition) return; + m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE ); - - m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 ); + m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 ); } - if (y_pos != -1) + if ((y_pos != -1) && (m_yScrollPixelsPerLine)) { int old_y = m_yScrollPosition; m_yScrollPosition = y_pos; - - // Calculate page size i.e. number of scroll units you get on the - // current client window + + // Calculate page size i.e. number of scroll units you get on the + // current client window int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 ); if (noPagePositions < 1) noPagePositions = 1; // Correct position if greater than extent of canvas minus - // the visible portion of it or if below zero + // the visible portion of it or if below zero m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition ); m_yScrollPosition = wxMax( 0, m_yScrollPosition ); + if (old_y == m_yScrollPosition) return; + m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE ); - m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine ); } - - + #ifdef __WXMAC__ - m_targetWindow->MacUpdateImmediately() ; + m_targetWindow->MacUpdateImmediately(); #endif } @@ -612,8 +629,11 @@ void wxScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) OnDraw(dc); } -// kbd handling -void wxScrolledWindow::OnKeyDown(wxKeyEvent& event) +// kbd handling: notice that we use OnChar() and not OnKeyDown() for +// compatibility here - if we used OnKeyDown(), the programs which process +// arrows themselves in their OnChar() would never get the message and like +// this they always have the priority +void wxScrolledWindow::OnChar(wxKeyEvent& event) { int stx, sty, // view origin szx, szy, // view size (total) @@ -621,17 +641,36 @@ void wxScrolledWindow::OnKeyDown(wxKeyEvent& event) ViewStart(&stx, &sty); GetClientSize(&clix, &cliy); - clix /= m_xScrollPixelsPerLine; - cliy /= m_yScrollPixelsPerLine; GetVirtualSize(&szx, &szy); - szx /= m_xScrollPixelsPerLine; - szy /= m_yScrollPixelsPerLine; + if( m_xScrollPixelsPerLine ) + { + clix /= m_xScrollPixelsPerLine; + szx /= m_xScrollPixelsPerLine; + } + else + { + clix = 0; + szx = -1; + } + if( m_yScrollPixelsPerLine ) + { + cliy /= m_yScrollPixelsPerLine; + szy /= m_yScrollPixelsPerLine; + } + else + { + cliy = 0; + szy = -1; + } + + int dsty; switch ( event.KeyCode() ) { case WXK_PAGEUP: case WXK_PRIOR: - Scroll(-1, sty - (5 * cliy / 6)); + dsty = sty - (5 * cliy / 6); + Scroll(-1, (dsty == -1) ? 0 : dsty); break; case WXK_PAGEDOWN: @@ -639,16 +678,12 @@ void wxScrolledWindow::OnKeyDown(wxKeyEvent& event) Scroll(-1, sty + (5 * cliy / 6)); break; - // notice that handling of Ctrl-Home/End is asymmetrical: Home goes to - // the beginning of the current line, Ctrl-Home returns to the origin - // while End goes to the bottom without changing horizontal position - // and only Ctrl-End does go to the most rightmost position as well case WXK_HOME: Scroll(0, event.ControlDown() ? 0 : -1); break; case WXK_END: - Scroll(event.ControlDown() ? szx - clix : -1, szy - cliy); + Scroll(szx - clix, event.ControlDown() ? szy - cliy : -1); break; case WXK_UP: