summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-11-09 17:20:48 +0000
committerrubidium <rubidium@openttd.org>2009-11-09 17:20:48 +0000
commitcbeba59fc2f7269ad3e8f325fc2624ac6013b654 (patch)
treed4e652115b1f8c0542332d2325f0c0b858f767a7
parenta84921f8f5e1d94e5a49588b1bf974dfbc2adc14 (diff)
downloadopenttd-cbeba59fc2f7269ad3e8f325fc2624ac6013b654.tar.xz
(svn r18033) -Codechange: make the padding for IMGBTN_2 the same as for IMGBTN; the image doesn't move, so the extra space at the right and bottom aren't needed
-rw-r--r--src/toolbar_gui.cpp2
-rw-r--r--src/widget.cpp23
-rw-r--r--src/window_gui.h8
3 files changed, 6 insertions, 27 deletions
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index d087806da..224edafb3 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1452,7 +1452,7 @@ public:
case TBSE_DATEPANEL:
SetDParam(0, ConvertYMDToDate(MAX_YEAR, 0, 1));
*size = GetStringBoundingBox(STR_WHITE_DATE_LONG);
- size->height = max(size->height, GetSpriteSize(SPR_IMG_SAVE).height + WD_IMGBTN2_TOP + WD_IMGBTN2_BOTTOM);
+ size->height = max(size->height, GetSpriteSize(SPR_IMG_SAVE).height + WD_IMGBTN_TOP + WD_IMGBTN_BOTTOM);
break;
}
}
diff --git a/src/widget.cpp b/src/widget.cpp
index 126dcd3f2..8fb787ff8 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -286,16 +286,8 @@ static inline void DrawImageButtons(const Rect &r, WidgetType type, Colours colo
assert(img != 0);
DrawFrameRect(r.left, r.top, r.right, r.bottom, colour, (clicked) ? FR_LOWERED : FR_NONE);
- int left, top;
- if ((type & WWT_MASK) == WWT_IMGBTN_2) {
- if (clicked) img++; // Show different image when clicked for #WWT_IMGBTN_2.
- left = WD_IMGBTN2_LEFT;
- top = WD_IMGBTN2_TOP;
- } else {
- left = WD_IMGBTN_LEFT;
- top = WD_IMGBTN_TOP;
- }
- DrawSprite(img, PAL_NONE, r.left + left + clicked, r.top + top + clicked);
+ if ((type & WWT_MASK) == WWT_IMGBTN_2 && clicked) img++; // Show different image when clicked for #WWT_IMGBTN_2.
+ DrawSprite(img, PAL_NONE, r.left + WD_IMGBTN_LEFT + clicked, r.top + WD_IMGBTN_TOP + clicked);
}
/**
@@ -2077,19 +2069,12 @@ void NWidgetLeaf::SetupSmallestSize(Window *w, bool init_array)
break;
}
case WWT_IMGBTN:
+ case WWT_IMGBTN_2:
case WWT_PUSHIMGBTN: {
static const Dimension extra = {WD_IMGBTN_LEFT + WD_IMGBTN_RIGHT, WD_IMGBTN_TOP + WD_IMGBTN_BOTTOM};
padding = &extra;
Dimension d2 = GetSpriteSize(this->widget_data);
- d2.width += extra.width;
- d2.height += extra.height;
- size = maxdim(size, d2);
- break;
- }
- case WWT_IMGBTN_2: {
- static const Dimension extra = {WD_IMGBTN2_LEFT + WD_IMGBTN2_RIGHT, WD_IMGBTN2_TOP + WD_IMGBTN2_BOTTOM};
- padding = &extra;
- Dimension d2 = maxdim(GetSpriteSize(this->widget_data), GetSpriteSize(this->widget_data + 1));
+ if (this->type == WWT_IMGBTN_2) d2 = maxdim(d2, GetSpriteSize(this->widget_data + 1));
d2.width += extra.width;
d2.height += extra.height;
size = maxdim(size, d2);
diff --git a/src/window_gui.h b/src/window_gui.h
index b3d8556db..723c00ef1 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -37,18 +37,12 @@ DECLARE_ENUM_AS_BIT_SET(FrameFlags);
/** Distances used in drawing widgets. */
enum WidgetDrawDistances {
- /* WWT_IMGBTN */
+ /* WWT_IMGBTN(_2) */
WD_IMGBTN_LEFT = 1, ///< Left offset of the image in the button.
WD_IMGBTN_RIGHT = 2, ///< Right offset of the image in the button.
WD_IMGBTN_TOP = 1, ///< Top offset of image in the button.
WD_IMGBTN_BOTTOM = 2, ///< Bottom offset of image in the button.
- /* WWT_IMGBTN_2 */
- WD_IMGBTN2_LEFT = 1, ///< Left offset of the images in the button.
- WD_IMGBTN2_RIGHT = 3, ///< Right offset of the images in the button.
- WD_IMGBTN2_TOP = 1, ///< Top offset of images in the button.
- WD_IMGBTN2_BOTTOM = 3, ///< Bottom offset of images in the button.
-
/* WWT_INSET */
WD_INSET_LEFT = 2, ///< Left offset of string.
WD_INSET_RIGHT = 2, ///< Right offset of string.