diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/highscore_gui.cpp | 1 | ||||
| -rw-r--r-- | src/main_gui.cpp | 1 | ||||
| -rw-r--r-- | src/misc_gui.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_gui.cpp | 2 | ||||
| -rw-r--r-- | src/statusbar_gui.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/dropdown.cpp | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp index aa7a203b4..7c87143d2 100644 --- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -34,6 +34,7 @@ struct EndGameHighScoreBaseWindow : Window { 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); } diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 14132cbba..4d6f1a170 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -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); diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index e5694edde..cd1ef3f1e 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -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) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index e82d162df..781110261 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1801,8 +1801,8 @@ struct NetworkClientListPopupWindow : Window { 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) diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index 14e2dc0d8..0dea9dd8b 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -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); } diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index d6680479c..3949cdbfb 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -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; |