From 1b3e8a8af6c11864226058a8fbffc4d765096468 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 14 Nov 2012 22:50:46 +0000 Subject: (svn r24745) -Codechange: Draw complete editbox via QueryString. --- src/misc_gui.cpp | 3 ++- src/widget.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index ba627ddee..1e0e8c8e5 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -778,7 +778,7 @@ void QueryString::HandleEditBox(Window *w, int wid) void QueryString::DrawEditBox(const Window *w, int wid) const { - const NWidgetBase *wi = w->GetWidget(wid); + const NWidgetLeaf *wi = w->GetWidget(wid); assert((wi->type & WWT_MASK) == WWT_EDITBOX); int left = wi->pos_x; @@ -786,6 +786,7 @@ void QueryString::DrawEditBox(const Window *w, int wid) const int top = wi->pos_y; int bottom = wi->pos_y + wi->current_y - 1; + DrawFrameRect(left, top, right, bottom, wi->colour, FR_LOWERED | FR_DARKENED); GfxFillRect(left + 1, top + 1, right - 1, bottom - 1, PC_BLACK); /* Limit the drawing of the string inside the widget boundaries */ diff --git a/src/widget.cpp b/src/widget.cpp index f1a249c27..df001815b 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2366,7 +2366,6 @@ void NWidgetLeaf::Draw(const Window *w) break; case WWT_EDITBOX: { - DrawFrameRect(r.left, r.top, r.right, r.bottom, this->colour, FR_LOWERED | FR_DARKENED); const QueryString *query = w->GetQueryString(this->index); if (query != NULL) query->DrawEditBox(w, this->index); break; -- cgit v1.2.3-54-g00ecf