Kaydet (Commit) 374fdbed authored tarafından Andrzej Hunt's avatar Andrzej Hunt

sc lok: during tiled rendering the cell-cursor is always visible

Change-Id: Ia802c19f5bfd2fe2e9909e3c611047c529a64200
(cherry picked from commit e77668eb)
üst 56f9d743
......@@ -6023,7 +6023,9 @@ void ScGridWindow::UpdateCursorOverlay()
const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
if (!maVisibleRange.isInside(nX, nY))
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
if (!pDrawLayer->isTiledRendering() && !maVisibleRange.isInside(nX, nY))
{
if (maVisibleRange.mnCol2 < nX || maVisibleRange.mnRow2 < nY)
return; // no further check needed, nothing visible
......@@ -6042,13 +6044,11 @@ void ScGridWindow::UpdateCursorOverlay()
}
// don't show the cursor in overlapped cells
const ScMergeFlagAttr& rMergeFlag = static_cast<const ScMergeFlagAttr&>( pPattern->GetItem(ATTR_MERGE_FLAG) );
bool bOverlapped = rMergeFlag.IsOverlapped();
// left or above of the screen?
bool bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
bool bVis = pDrawLayer->isTiledRendering() || ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
if (!bVis)
{
SCCOL nEndX = nX;
......@@ -6078,7 +6078,7 @@ void ScGridWindow::UpdateCursorOverlay()
}
// in the tiled rendering case, don't limit to the screen size
if (bMaybeVisible)
if (bMaybeVisible || pDrawLayer->isTiledRendering())
{
long nSizeXPix;
long nSizeYPix;
......@@ -6121,8 +6121,6 @@ void ScGridWindow::UpdateCursorOverlay()
}
}
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
if ( !aPixelRects.empty() )
{
if (pDrawLayer->isTiledRendering()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment