# HG changeset patch # User frosch # Date 2011-12-13 18:27:04 # Node ID ab162cfbccf976a37907aa932713d879bd105f16 # Parent 950cffe6e5b1c4b629c1283dc094df944f698472 (svn r23509) -Fix [FS#4884]: Drawing of newspaper headlines used different padding than the initial sizing of the window. diff --git a/src/news_gui.cpp b/src/news_gui.cpp --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -103,7 +103,7 @@ static const NWidgetPart _nested_normal_ NWidget(NWID_SPACER), SetFill(0, 1), EndContainer(), EndContainer(), - NWidget(WWT_EMPTY, COLOUR_WHITE, NTW_MESSAGE), SetMinimalSize(428, 154), SetPadding(0, 1, 1, 1), + NWidget(WWT_EMPTY, COLOUR_WHITE, NTW_MESSAGE), SetMinimalSize(428, 154), SetPadding(0, 5, 1, 5), EndContainer(), }; @@ -183,7 +183,7 @@ static const NWidgetPart _nested_thin_ne NWidget(NWID_SPACER), SetFill(0, 1), EndContainer(), EndContainer(), - NWidget(WWT_EMPTY, COLOUR_WHITE, NTW_MESSAGE), SetMinimalSize(428, 48), SetFill(1, 0), SetPadding(0, 1, 0, 1), + NWidget(WWT_EMPTY, COLOUR_WHITE, NTW_MESSAGE), SetMinimalSize(428, 48), SetFill(1, 0), SetPadding(0, 5, 0, 5), NWidget(NWID_VIEWPORT, INVALID_COLOUR, NTW_VIEWPORT), SetMinimalSize(426, 70), SetPadding(1, 2, 2, 2), EndContainer(), }; @@ -208,7 +208,7 @@ static const NWidgetPart _nested_small_n NWidget(WWT_INSET, COLOUR_LIGHT_BLUE, NTW_INSET), SetPadding(2, 2, 2, 2), NWidget(NWID_VIEWPORT, INVALID_COLOUR, NTW_VIEWPORT), SetPadding(1, 1, 1, 1), SetMinimalSize(274, 47), SetFill(1, 0), EndContainer(), - NWidget(WWT_EMPTY, COLOUR_WHITE, NTW_MESSAGE), SetMinimalSize(275, 20), SetFill(1, 0), + NWidget(WWT_EMPTY, COLOUR_WHITE, NTW_MESSAGE), SetMinimalSize(275, 20), SetFill(1, 0), SetPadding(0, 5, 0, 5), EndContainer(), }; @@ -405,7 +405,7 @@ struct NewsWindow : Window { case NTW_MESSAGE: CopyInDParam(0, this->ni->params, lengthof(this->ni->params)); - DrawStringMultiLine(r.left + 2, r.right - 2, r.top, r.bottom, this->ni->string_id, TC_FROMSTRING, SA_CENTER); + DrawStringMultiLine(r.left, r.right, r.top, r.bottom, this->ni->string_id, TC_FROMSTRING, SA_CENTER); break; case NTW_MGR_FACE: {