cpp/openttd-patchpack/source Changeset - r15292:4dd646d9f2a5

Changeset - r15292:4dd646d9f2a5

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 14 years ago 2010-06-07 19:56:32
frosch@openttd.org

(svn r19943) -Fix [FS#3865]: Disallow moving of vehicle news window.

3 files changed with 10 insertions and 5 deletions:

src/news_gui.cpp

src/widget.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/news_gui.cpp

➞

Show inline comments

@@ @@ -193,10 +193,10 @@ static const WindowDesc _thin_news_desc( @@
 /* Small news items. */
 static const NWidgetPart _nested_small_news_widgets[] = {
 	/* Caption + close box */
+	/* Caption + close box. The caption is no WWT_CAPTION as the window shall not be moveable and so on. */
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE, NTW_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NTW_CAPTION), SetDataTip(STR_NEWS_MESSAGE_CAPTION, STR_NULL),
+		NWidget(WWT_EMPTY, COLOUR_LIGHT_BLUE, NTW_CAPTION), SetFill(1, 0),
 	EndContainer(),
 	/* Main part */
@@ @@ -394,9 +394,13 @@ struct NewsWindow : Window { @@
 	virtual void DrawWidget(const Rect &r, int widget) const
+	{
 		switch (widget) {
 			case NTW_CAPTION:
 				DrawCaption(r, COLOUR_LIGHT_BLUE, this->owner, STR_NEWS_MESSAGE_CAPTION);
 				break;
 			case NTW_PANEL:
 				this->DrawNewsBorder(r);
-				return;
+				break;
 			case NTW_MESSAGE:
 				CopyInDParam(0, this->ni->params, lengthof(this->ni->params));

src/widget.cpp

➞

Show inline comments

@@ @@ -526,7 +526,7 @@ static inline void DrawCloseBox(const Re @@
  * @param owner  'Owner' of the window.
  * @param str    Text to draw in the bar.
  */
-static inline void DrawCaption(const Rect &r, Colours colour, Owner owner, StringID str)
 void DrawCaption(const Rect &r, Colours colour, Owner owner, StringID str)
+{
 	DrawFrameRect(r.left, r.top, r.right, r.bottom, colour, FR_BORDERONLY);
 	DrawFrameRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, colour, (owner == INVALID_OWNER) ? FR_LOWERED | FR_DARKENED : FR_LOWERED | FR_DARKENED | FR_BORDERONLY);

src/window_gui.h

➞

Show inline comments

@@ @@ -132,8 +132,9 @@ enum WidgetDrawDistances { @@
 	WD_PAR_VSEP_WIDE   = 8,      ///< Large amount of vertical space between two paragraphs of text.
 };
-/* wiget.cpp */
+/* widget.cpp */
 void DrawFrameRect(int left, int top, int right, int bottom, Colours colour, FrameFlags flags);
 void DrawCaption(const Rect &r, Colours colour, Owner owner, StringID str);
 /* window.cpp */
 extern Window *_z_front_window;

0 comments (0 inline, 0 general)