|
 |
f325b2 |
From 9cb5bab53bf2211762f3470cba824ce1ecdc9391 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Andrzej Hunt <andrzej@ahunt.org>
|
|
|
f325b2 |
Date: Fri, 13 Nov 2015 11:17:43 +0100
|
|
|
f325b2 |
Subject: [PATCH 321/398] sc lok: during tiled rendering the cell-cursor is
|
|
|
f325b2 |
always visible
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ia802c19f5bfd2fe2e9909e3c611047c529a64200
|
|
|
f325b2 |
(cherry picked from commit e77668eb1e7abe522493235dadfca08ca451ad99)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sc/source/ui/view/gridwin.cxx | 12 +++++-------
|
|
|
f325b2 |
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
|
|
|
f325b2 |
index c2d391d038ef..96f10568b797 100644
|
|
|
f325b2 |
--- a/sc/source/ui/view/gridwin.cxx
|
|
|
f325b2 |
+++ b/sc/source/ui/view/gridwin.cxx
|
|
|
f325b2 |
@@ -6019,7 +6019,9 @@ void ScGridWindow::UpdateCursorOverlay()
|
|
|
f325b2 |
|
|
|
f325b2 |
const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
|
|
|
f325b2 |
|
|
|
f325b2 |
- if (!maVisibleRange.isInside(nX, nY))
|
|
|
f325b2 |
+ ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ if (!pDrawLayer->isTiledRendering() && !maVisibleRange.isInside(nX, nY))
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if (maVisibleRange.mnCol2 < nX || maVisibleRange.mnRow2 < nY)
|
|
|
f325b2 |
return; // no further check needed, nothing visible
|
|
|
f325b2 |
@@ -6038,13 +6040,11 @@ void ScGridWindow::UpdateCursorOverlay()
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
// don't show the cursor in overlapped cells
|
|
|
f325b2 |
-
|
|
|
f325b2 |
const ScMergeFlagAttr& rMergeFlag = static_cast<const ScMergeFlagAttr&>( pPattern->GetItem(ATTR_MERGE_FLAG) );
|
|
|
f325b2 |
bool bOverlapped = rMergeFlag.IsOverlapped();
|
|
|
f325b2 |
|
|
|
f325b2 |
// left or above of the screen?
|
|
|
f325b2 |
-
|
|
|
f325b2 |
- bool bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
|
|
|
f325b2 |
+ bool bVis = pDrawLayer->isTiledRendering() || ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
|
|
|
f325b2 |
if (!bVis)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SCCOL nEndX = nX;
|
|
|
f325b2 |
@@ -6074,7 +6074,7 @@ void ScGridWindow::UpdateCursorOverlay()
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
// in the tiled rendering case, don't limit to the screen size
|
|
|
f325b2 |
- if (bMaybeVisible)
|
|
|
f325b2 |
+ if (bMaybeVisible || pDrawLayer->isTiledRendering())
|
|
|
f325b2 |
{
|
|
|
f325b2 |
long nSizeXPix;
|
|
|
f325b2 |
long nSizeYPix;
|
|
|
f325b2 |
@@ -6117,8 +6117,6 @@ void ScGridWindow::UpdateCursorOverlay()
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
- ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
|
|
|
f325b2 |
-
|
|
|
f325b2 |
if ( !aPixelRects.empty() )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if (pDrawLayer->isTiledRendering()) {
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|