Fix tests, test mask updates

qgis · Dec 6, 2018 · a97d335 · a97d335
1 parent 88c8424
commit a97d335
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 1 deletion.
diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp
@@ -811,7 +811,7 @@ void QgsLayoutItemMapGrid::drawGridFrameZebraBorder( QPainter *p, const QMap< do
   QMap< double, double > pos = borderPos;
 
   double currentCoord = 0.0;
-  bool color1 = true;
+  bool color1 = false;
   double x = 0;
   double y = 0;
   double width = 0;
@@ -835,6 +835,8 @@ void QgsLayoutItemMapGrid::drawGridFrameZebraBorder( QPainter *p, const QMap< do
       drawTLBox = border == QgsLayoutItemMapGrid::Left;
       drawTRBox = border == QgsLayoutItemMapGrid::Right;
     }
+    if ( !drawTLBox && border == QgsLayoutItemMapGrid::Left )
+      color1 = true;
   }
   else if ( border == QgsLayoutItemMapGrid::Top || border == QgsLayoutItemMapGrid::Bottom )
   {

diff --git a/...mposermap_filteredannotations/expected_composermap_filteredannotations_mask.png b/...mposermap_filteredannotations/expected_composermap_filteredannotations_mask.png
diff --git a/...xpected_composermap_framedivisions/expected_composermap_framedivisions_mask.png b/...xpected_composermap_framedivisions/expected_composermap_framedivisions_mask.png
diff --git a/.../expected_composermap_gridframeonly/expected_composermap_gridframeonly_mask.png b/.../expected_composermap_gridframeonly/expected_composermap_gridframeonly_mask.png
diff --git a/...ected_composermap_gridreprojected/expected_composermap_gridreprojected_mask.png b/...ected_composermap_gridreprojected/expected_composermap_gridreprojected_mask.png
diff --git a/...composermap_rotatedannotations/expected_composermap_rotatedannotations_mask.png b/...composermap_rotatedannotations/expected_composermap_rotatedannotations_mask.png
diff --git a/...id/expected_composermap_rotatedframe/expected_composermap_rotatedframe_mask.png b/...id/expected_composermap_rotatedframe/expected_composermap_rotatedframe_mask.png
diff --git a/...ser_mapgrid/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png b/...ser_mapgrid/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png
diff --git a/...apgrid/expected_composermap_zebrastyle/expected_composermap_zebrastyle_mask.png b/...apgrid/expected_composermap_zebrastyle/expected_composermap_zebrastyle_mask.png
diff --git a/...ected_composermap_zebrastyle_left/expected_composermap_zebrastyle_left_mask.png b/...ected_composermap_zebrastyle_left/expected_composermap_zebrastyle_left_mask.png
diff --git a/...composermap_zebrastyle_lefttop/expected_composermap_zebrastyle_lefttop_mask.png b/...composermap_zebrastyle_lefttop/expected_composermap_zebrastyle_lefttop_mask.png
diff --git a/...p_zebrastyle_lefttopright/expected_composermap_zebrastyle_lefttopright_mask.png b/...p_zebrastyle_lefttopright/expected_composermap_zebrastyle_lefttopright_mask.png