Kaydet (Commit) 43507c9e authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Grid lines should be immediately above or below the background.

Especially grid lines should never be above cell borders.
üst fd29a786
...@@ -695,9 +695,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod ...@@ -695,9 +695,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
pContentDev->SetMapMode(MAP_PIXEL); pContentDev->SetMapMode(MAP_PIXEL);
aOutputData.DrawDocumentBackground(); aOutputData.DrawDocumentBackground();
if ( bGridFirst && ( bGrid || bPage ) ) if ( bGridFirst && ( bGrid || bPage ) )
aOutputData.DrawGrid( bGrid, bPage ); aOutputData.DrawGrid( bGrid, bPage );
aOutputData.DrawBackground(); aOutputData.DrawBackground();
if ( !bGridFirst && ( bGrid || bPage ) )
aOutputData.DrawGrid( bGrid, bPage );
if ( bPageMode ) if ( bPageMode )
{ {
// DrawPagePreview draws complete lines/page numbers, must always be clipped // DrawPagePreview draws complete lines/page numbers, must always be clipped
...@@ -707,6 +713,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod ...@@ -707,6 +713,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
pContentDev->SetClipRegion(); pContentDev->SetClipRegion();
} }
} }
aOutputData.DrawShadow(); aOutputData.DrawShadow();
aOutputData.DrawFrame(); aOutputData.DrawFrame();
if ( !bLogicText ) if ( !bLogicText )
...@@ -730,10 +737,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod ...@@ -730,10 +737,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
if ( rOpts.GetOption( VOPT_NOTES ) ) if ( rOpts.GetOption( VOPT_NOTES ) )
aOutputData.DrawNoteMarks(); aOutputData.DrawNoteMarks();
if ( !bGridFirst && ( bGrid || bPage ) )
{
aOutputData.DrawGrid( bGrid, bPage );
}
aOutputData.DrawClipMarks(); aOutputData.DrawClipMarks();
// Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst // Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst
......
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