(svn r3302) - Fix: split drawing of text buttons and the closebox, so the closebox symbol can be centred.

1 files changed, 9 insertions, 1 deletions

diff --git a/widget.c b/widget.c
index 9e1c4a213..3f9285c4c 100644
--- a/widget.c
+++ b/widget.c
@@ -191,7 +191,7 @@ void DrawWindowWidgets(const Window *w)
 			goto draw_default;
 		}
 
-		case WWT_CLOSEBOX: /* WWT_TEXTBTN */
+		case WWT_TEXTBTN: /* WWT_TEXTBTN */
 		case WWT_4: {
 			DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : 0);
 			}
@@ -410,6 +410,14 @@ void DrawWindowWidgets(const Window *w)
 			break;
 		}
 
+		case WWT_CLOSEBOX: {
+			assert(r.right - r.left == 10); // ensure the same sizes are used everywhere
+
+			DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, 0);
+			DrawString(r.left + 2, r.top + 2, STR_00C5, 0);
+			break;
+		}
+
 		case WWT_CAPTION: {
 			assert(r.bottom - r.top == 13); // XXX - to ensure the same sizes are used everywhere!
 			DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, FR_BORDERONLY);