X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/438e3558adf77a68f56b6e4d30b359f8361facac..77611ad4da9df336a0805508276a81b8f4437107:/src/generic/scrolwin.cpp diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp index 4b57d21f4d..1a8af01547 100644 --- a/src/generic/scrolwin.cpp +++ b/src/generic/scrolwin.cpp @@ -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, @@ -109,8 +110,14 @@ bool wxScrolledWindow::Create(wxWindow *parent, m_targetWindow = this; - // we need wxWANTS_CHARS to process arrows ourselves - return wxPanel::Create(parent, id, pos, size, style | wxWANTS_CHARS, 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() @@ -129,16 +136,20 @@ 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; @@ -260,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 @@ -317,6 +328,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event) break; } case wxEVT_SCROLLWIN_THUMBTRACK: + case wxEVT_SCROLLWIN_THUMBRELEASE: { if (orient == wxHORIZONTAL) nScrollInc = pos - m_xScrollPosition; @@ -385,14 +397,14 @@ void wxScrolledWindow::AdjustScrollbars() 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); @@ -407,13 +419,13 @@ void wxScrolledWindow::AdjustScrollbars() 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 ); @@ -498,54 +510,58 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize) */ void wxScrolledWindow::Scroll( int x_pos, int y_pos ) { + 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 ); - m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE ); + if (old_x == m_xScrollPosition) return; - m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 ); + m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE ); + 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 } @@ -619,31 +635,42 @@ void wxScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) // this they always have the priority void wxScrolledWindow::OnChar(wxKeyEvent& event) { - if ( !m_xScrollPixelsPerLine || !m_yScrollPixelsPerLine ) - { - // stop now - no scroll line size - event.Skip(); - - return; - } - int stx, sty, // view origin szx, szy, // view size (total) clix, cliy; // view size (on screen) 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: @@ -651,16 +678,12 @@ void wxScrolledWindow::OnChar(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: