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

Scrolling improvements

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-07-04 15:35:34 +00:00
parent e5ab82d310
commit 3956d02ab6
1 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/richtext/richtextctrl.cpp
View File

@@ -212,6 +212,8 @@ void wxRichTextCtrl::Clear()
m_caretAtLineStart = false; m_caretAtLineStart = false;
m_selectionRange.SetRange(-2, -2); m_selectionRange.SetRange(-2, -2);
SetScrollbars(0, 0, 0, 0, 0, 0);
if (m_freezeCount == 0) if (m_freezeCount == 0)
{ {
SetupScrollbars(); SetupScrollbars();
@@ -709,16 +711,16 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
int ppuX, ppuY; int ppuX, ppuY;
GetScrollPixelsPerUnit(& ppuX, & ppuY); GetScrollPixelsPerUnit(& ppuX, & ppuY);
int startX, startY; int startXUnits, startYUnits;
GetViewStart(& startX, & startY); GetViewStart(& startXUnits, & startYUnits);
startX = 0; int startY = startYUnits * ppuY;
startY = startY * ppuY;
int sx = 0, sy = 0; int sx = 0, sy = 0;
GetVirtualSize(& sx, & sy); GetVirtualSize(& sx, & sy);
sx = 0; int sxUnits = 0;
int syUnits = 0;
if (ppuY != 0) if (ppuY != 0)
sy = sy/ppuY; syUnits = sy/ppuY;
wxRect rect = line->GetRect(); wxRect rect = line->GetRect();
@@ -734,11 +736,15 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
// Make it scroll so this item is at the bottom // Make it scroll so this item is at the bottom
// of the window // of the window
int y = rect.y - (clientSize.y - rect.height); int y = rect.y - (clientSize.y - rect.height);
y = (int) (0.5 + y/ppuY); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startY != y) // If we're still off the screen, scroll another line down
if ((rect.y + rect.height) > (clientSize.y + (yUnits*ppuY)))
yUnits ++;
if (startYUnits != yUnits)
{ {
SetScrollbars(ppuX, ppuY, sx, sy, 0, y); SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);
scrolled = true; scrolled = true;
} }
} }
@@ -747,11 +753,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
// Make it scroll so this item is at the top // Make it scroll so this item is at the top
// of the window // of the window
int y = rect.y ; int y = rect.y ;
y = (int) (0.5 + y/ppuY); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startY != y) if (startYUnits != yUnits)
{ {
SetScrollbars(ppuX, ppuY, sx, sy, 0, y); SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);
scrolled = true; scrolled = true;
} }
} }
@@ -764,11 +770,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
// Make it scroll so this item is at the top // Make it scroll so this item is at the top
// of the window // of the window
int y = rect.y ; int y = rect.y ;
y = (int) (0.5 + y/ppuY); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startY != y) if (startYUnits != yUnits)
{ {
SetScrollbars(ppuX, ppuY, sx, sy, 0, y); SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);
scrolled = true; scrolled = true;
} }
} }
@@ -777,11 +783,15 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
// Make it scroll so this item is at the bottom // Make it scroll so this item is at the bottom
// of the window // of the window
int y = rect.y - (clientSize.y - rect.height); int y = rect.y - (clientSize.y - rect.height);
y = (int) (0.5 + y/ppuY); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startY != y) // If we're still off the screen, scroll another line down
if ((rect.y + rect.height) > (clientSize.y + (yUnits*ppuY)))
yUnits ++;
if (startYUnits != yUnits)
{ {
SetScrollbars(ppuX, ppuY, sx, sy, 0, y); SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);
scrolled = true; scrolled = true;
} }
} }
@@ -1439,19 +1449,20 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
// TODO: reimplement scrolling so we scroll by line, not by fixed number // TODO: reimplement scrolling so we scroll by line, not by fixed number
// of pixels. See e.g. wxVScrolledWindow for ideas. // of pixels. See e.g. wxVScrolledWindow for ideas.
int pixelsPerUnit = 5; // 10; int pixelsPerUnit = 5;
wxSize clientSize = GetClientSize(); wxSize clientSize = GetClientSize();
int maxHeight = GetBuffer().GetCachedSize().y; int maxHeight = GetBuffer().GetCachedSize().y;
int unitsY = maxHeight/pixelsPerUnit; // Round up so we have at least maxHeight pixels
int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5);
int startX = 0, startY = 0; int startX = 0, startY = 0;
if (!atTop) if (!atTop)
GetViewStart(& startX, & startY); GetViewStart(& startX, & startY);
int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0); int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0);
int maxPositionY = (wxMax(maxHeight - clientSize.y, 0))/pixelsPerUnit; int maxPositionY = (int) ((((float)(wxMax((unitsY*pixelsPerUnit) - clientSize.y, 0)))/((float)pixelsPerUnit)) + 0.5);
// Move to previous scroll position if // Move to previous scroll position if
// possible // possible