Mercurial > hg > openttd

changeset 18416:2dd1b14e0651 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23252) -Codechange: Add WD_BEVEL_xxx constants.
author frosch <frosch@openttd.org>
date Fri, 18 Nov 2011 20:38:30 +0000
parents 8abe19c16b0b
children 1eab524b9f03
files src/widget.cpp src/window_gui.h
diffstat 2 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -184,20 +184,20 @@
 		uint interior;
 
 		if (flags & FR_LOWERED) {
-			GfxFillRect(left,     top,     left,  bottom,     dark);
-			GfxFillRect(left + 1, top,     right, top,        dark);
-			GfxFillRect(right,    top + 1, right, bottom - 1, light);
-			GfxFillRect(left + 1, bottom,  right, bottom,     light);
+			GfxFillRect(left,                 top,                left,                   bottom,                   dark);
+			GfxFillRect(left + WD_BEVEL_LEFT, top,                right,                  top,                      dark);
+			GfxFillRect(right,                top + WD_BEVEL_TOP, right,                  bottom - WD_BEVEL_BOTTOM, light);
+			GfxFillRect(left + WD_BEVEL_LEFT, bottom,             right,                  bottom,                   light);
 			interior = (flags & FR_DARKENED ? medium_dark : medium_light);
 		} else {
-			GfxFillRect(left,     top,    left,      bottom - 1, light);
-			GfxFillRect(left + 1, top,    right - 1, top,        light);
-			GfxFillRect(right,    top,    right,     bottom - 1, dark);
-			GfxFillRect(left,     bottom, right,     bottom,     dark);
+			GfxFillRect(left,                 top,                left,                   bottom - WD_BEVEL_BOTTOM, light);
+			GfxFillRect(left + WD_BEVEL_LEFT, top,                right - WD_BEVEL_RIGHT, top,                      light);
+			GfxFillRect(right,                top,                right,                  bottom - WD_BEVEL_BOTTOM, dark);
+			GfxFillRect(left,                 bottom,             right,                  bottom,                   dark);
 			interior = medium_dark;
 		}
 		if (!(flags & FR_BORDERONLY)) {
-			GfxFillRect(left + 1, top + 1, right - 1, bottom - 1, interior);
+			GfxFillRect(left + WD_BEVEL_LEFT, top + WD_BEVEL_TOP, right - WD_BEVEL_RIGHT, bottom - WD_BEVEL_BOTTOM, interior);
 		}
 	}
 }
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -56,6 +56,12 @@
 	WD_SCROLLBAR_TOP    = 2,    ///< Top offset of scrollbar.
 	WD_SCROLLBAR_BOTTOM = 2,    ///< Bottom offset of scrollbar.
 
+	/* Size of the pure frame bevel without any padding. */
+	WD_BEVEL_LEFT       = 1,    ///< Width of left bevel border.
+	WD_BEVEL_RIGHT      = 1,    ///< Width of right bevel border.
+	WD_BEVEL_TOP        = 1,    ///< Height of top bevel border.
+	WD_BEVEL_BOTTOM     = 1,    ///< Height of bottom bevel border.
+
 	/* FrameRect widgets, all text buttons, panel, editbox */
 	WD_FRAMERECT_LEFT   = 2,    ///< Offset at left to draw the frame rectangular area
 	WD_FRAMERECT_RIGHT  = 2,    ///< Offset at right to draw the frame rectangular area