[Scummvm-git-logs] scummvm master -> eabb81829f29716e949890844029567687626bc8

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eabb81829f GRAPHICS: Fix modern theme tab widgets being 2px too tall


Commit: eabb81829f29716e949890844029567687626bc8
    https://github.com/scummvm/scummvm/commit/eabb81829f29716e949890844029567687626bc8
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-10-07T22:18:27+02:00

Commit Message:
GRAPHICS: Fix modern theme tab widgets being 2px too tall

This was noticeable in the graphics tab of the options dialog when
scrolling down. The widgets would be partially drawn on top of the
tabs.

Changed paths:
    graphics/VectorRendererSpec.cpp


diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index 6b8c6eb..e60da57 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -1457,7 +1457,7 @@ drawTabAlg(int x1, int y1, int w, int h, int r, PixelType color, VectorRenderer:
 	PixelType *ptr_fill = (PixelType *)Base::_activeSurface->getBasePtr(x1, y1);
 
 	int real_radius = r;
-	int short_h = h - r + 2;
+	int short_h = h - r;
 	int long_h = h;
 
 	if (fill_m == kFillDisabled) {
@@ -1562,7 +1562,7 @@ drawTabAlgClip(int x1, int y1, int w, int h, int r, PixelType color, VectorRende
 	int fill_x = x1, fill_y = y1;
 
 	int real_radius = r;
-	int short_h = h - r + 2;
+	int short_h = h - r;
 	int long_h = h;
 
 	if (fill_m == kFillDisabled) {
@@ -1679,7 +1679,7 @@ drawTabShadow(int x1, int y1, int w, int h, int r) {
 		PixelType *ptr_tr = (PixelType *)Base::_activeSurface->getBasePtr(xstart + width - r, ystart + r);
 		PixelType *ptr_fill = (PixelType *)Base::_activeSurface->getBasePtr(xstart, ystart);
 
-		int short_h = height - (2 * r) + 2;
+		int short_h = height - (2 * r);
 		PixelType color = _format.RGBToColor(0, 0, 0);
 
 		BE_RESET();
@@ -1743,7 +1743,7 @@ drawTabShadowClip(int x1, int y1, int w, int h, int r) {
 		int tl_x = xstart + r, tl_y = ystart + r;
 		int fill_x = xstart, fill_y = ystart;
 
-		int short_h = height - (2 * r) + 2;
+		int short_h = height - (2 * r);
 		PixelType color = _format.RGBToColor(0, 0, 0);
 
 		BE_RESET();
@@ -3482,7 +3482,7 @@ drawTabAlg(int x1, int y1, int w, int h, int r, PixelType color, VectorRenderer:
 			}
 		}
 
-		int short_h = h - r + 2;
+		int short_h = h - r;
 
 		ptr_fill += pitch * real_radius;
 		while (short_h--) {
@@ -3513,7 +3513,7 @@ drawTabAlg(int x1, int y1, int w, int h, int r, PixelType color, VectorRenderer:
 		color1 = color2 = color;
 
 		int long_h = h;
-		int short_h = h - real_radius + 2;
+		int short_h = h - real_radius;
 		x = real_radius;
 		y = 0;
 		T = 0;