cpp/openttd-patchpack/source Changeset - r18101:161afafad87e

Changeset - r18101:161afafad87e

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

yexo - 13 years ago 2011-09-15 13:26:27
yexo@openttd.org

(svn r22932) -Fix [FS#4766]: disable the white border on window creation for several windows (based on patch by monoid)

6 files changed with 6 insertions and 4 deletions:

src/highscore_gui.cpp

src/main_gui.cpp

src/misc_gui.cpp

src/network/network_gui.cpp

src/statusbar_gui.cpp

src/widgets/dropdown.cpp

0 comments (0 inline, 0 general)

src/highscore_gui.cpp

➞

Show inline comments

@@ @@ -34,6 +34,7 @@ struct EndGameHighScoreBaseWindow : Wind @@
 	EndGameHighScoreBaseWindow(const WindowDesc *desc) : Window()
+	{
 		this->InitNested(desc);
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		ResizeWindow(this, _screen.width - this->width, _screen.height - this->height);
+	}

src/main_gui.cpp

➞

Show inline comments

@@ @@ -244,6 +244,7 @@ struct MainWindow : Window @@
 	MainWindow() : Window()
+	{
 		this->InitNested(&_main_window_desc, 0);
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		ResizeWindow(this, _screen.width, _screen.height);
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(MW_VIEWPORT);

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -902,7 +902,7 @@ struct TooltipsWindow : public Window @@
 		this->InitNested(&_tool_tips_desc);
-		this->flags4 &= ~WF_WHITE_BORDER_MASK; // remove white-border from tooltip
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK); // remove white-border from tooltip
+	}
 	virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -1801,8 +1801,8 @@ struct NetworkClientListPopupWindow : Wi @@
 			this->AddAction(STR_NETWORK_CLIENTLIST_BAN, &ClientList_Ban);
+		}
 		this->flags4 &= ~WF_WHITE_BORDER_MASK;
 		this->InitNested(desc, client_id);
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
+	}
 	virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)

src/statusbar_gui.cpp

➞

Show inline comments

@@ @@ -89,11 +89,11 @@ struct StatusBarWindow : Window { @@
 	StatusBarWindow(const WindowDesc *desc) : Window()
+	{
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		this->ticker_scroll    =   TICKER_STOP;
 		this->reminder_timeout = REMINDER_STOP;
 		this->InitNested(desc);
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		PositionStatusbar(this);
+	}

src/widgets/dropdown.cpp

➞

Show inline comments

@@ @@ -148,7 +148,7 @@ struct DropdownWindow : Window { @@
 		this->GetWidget<NWidgetStacked>(DDM_SHOW_SCROLL)->SetDisplayedPlane(scroll ? 0 : SZSP_NONE);
 		this->FinishInitNested(&_dropdown_desc, 0);
-		this->flags4 &= ~WF_WHITE_BORDER_MASK;
+		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		/* Total length of list */
 		int list_height = 0;

0 comments (0 inline, 0 general)