mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right name when its only used for client list popups
This commit is contained in:
parent
e2d5ce1b0e
commit
835ae31f45
|
@ -556,7 +556,7 @@ Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY)
|
||||||
GeneratePresidentName(c);
|
GeneratePresidentName(c);
|
||||||
|
|
||||||
SetWindowDirty(WC_GRAPH_LEGEND, 0);
|
SetWindowDirty(WC_GRAPH_LEGEND, 0);
|
||||||
SetWindowDirty(WC_TOOLBAR_MENU, 0);
|
SetWindowDirty(WC_CLIENT_LIST_POPUP, 0);
|
||||||
SetWindowDirty(WC_CLIENT_LIST, 0);
|
SetWindowDirty(WC_CLIENT_LIST, 0);
|
||||||
BuildOwnerLegend();
|
BuildOwnerLegend();
|
||||||
InvalidateWindowData(WC_SMALLMAP, 0, 1);
|
InvalidateWindowData(WC_SMALLMAP, 0, 1);
|
||||||
|
|
|
@ -1701,7 +1701,7 @@ static const NWidgetPart _nested_client_list_popup_widgets[] = {
|
||||||
|
|
||||||
static const WindowDesc _client_list_popup_desc(
|
static const WindowDesc _client_list_popup_desc(
|
||||||
WDP_AUTO, 0, 0,
|
WDP_AUTO, 0, 0,
|
||||||
WC_TOOLBAR_MENU, WC_CLIENT_LIST,
|
WC_CLIENT_LIST_POPUP, WC_CLIENT_LIST,
|
||||||
0,
|
0,
|
||||||
_nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets)
|
_nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets)
|
||||||
);
|
);
|
||||||
|
@ -1875,7 +1875,7 @@ struct NetworkClientListPopupWindow : Window {
|
||||||
this->actions[index].proc(this->client_no);
|
this->actions[index].proc(this->client_no);
|
||||||
}
|
}
|
||||||
|
|
||||||
DeleteWindowById(WC_TOOLBAR_MENU, 0);
|
DeleteWindowById(WC_CLIENT_LIST_POPUP, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1885,7 +1885,7 @@ struct NetworkClientListPopupWindow : Window {
|
||||||
*/
|
*/
|
||||||
static void PopupClientList(int client_no, int x, int y)
|
static void PopupClientList(int client_no, int x, int y)
|
||||||
{
|
{
|
||||||
DeleteWindowById(WC_TOOLBAR_MENU, 0);
|
DeleteWindowById(WC_CLIENT_LIST_POPUP, 0);
|
||||||
|
|
||||||
if (NetworkFindClientInfo(client_no) == NULL) return;
|
if (NetworkFindClientInfo(client_no) == NULL) return;
|
||||||
|
|
||||||
|
|
|
@ -2565,7 +2565,6 @@ restart_search:
|
||||||
w->window_class != WC_SELECT_GAME &&
|
w->window_class != WC_SELECT_GAME &&
|
||||||
w->window_class != WC_MAIN_TOOLBAR &&
|
w->window_class != WC_MAIN_TOOLBAR &&
|
||||||
w->window_class != WC_STATUS_BAR &&
|
w->window_class != WC_STATUS_BAR &&
|
||||||
w->window_class != WC_TOOLBAR_MENU &&
|
|
||||||
w->window_class != WC_TOOLTIPS &&
|
w->window_class != WC_TOOLTIPS &&
|
||||||
(w->flags4 & WF_STICKY) == 0) { // do not delete windows which are 'pinned'
|
(w->flags4 & WF_STICKY) == 0) { // do not delete windows which are 'pinned'
|
||||||
|
|
||||||
|
@ -2626,7 +2625,6 @@ restart_search:
|
||||||
/** Delete all always on-top windows to get an empty screen */
|
/** Delete all always on-top windows to get an empty screen */
|
||||||
void HideVitalWindows()
|
void HideVitalWindows()
|
||||||
{
|
{
|
||||||
DeleteWindowById(WC_TOOLBAR_MENU, 0);
|
|
||||||
DeleteWindowById(WC_MAIN_TOOLBAR, 0);
|
DeleteWindowById(WC_MAIN_TOOLBAR, 0);
|
||||||
DeleteWindowById(WC_STATUS_BAR, 0);
|
DeleteWindowById(WC_STATUS_BAR, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ enum WindowClass {
|
||||||
WC_QUERY_STRING,
|
WC_QUERY_STRING,
|
||||||
WC_SAVELOAD,
|
WC_SAVELOAD,
|
||||||
WC_SELECT_GAME,
|
WC_SELECT_GAME,
|
||||||
WC_TOOLBAR_MENU,
|
WC_CLIENT_LIST_POPUP,
|
||||||
WC_INCOME_GRAPH,
|
WC_INCOME_GRAPH,
|
||||||
WC_OPERATING_PROFIT,
|
WC_OPERATING_PROFIT,
|
||||||
WC_TOOLTIPS,
|
WC_TOOLTIPS,
|
||||||
|
|
Loading…
Reference in New Issue