mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-26 13:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't mix static and dynamic events

Browse Source 
Commit 309ed5ef28 used dynamic events
which prevents some other menu items from working properly. So don't mix
static and dynamic events for top window.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2026-07-19 09:41:46 +02:00
parent a80446eb59
commit df06b6895e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+5 -4
View File
@@ -357,6 +357,7 @@ enum
ID_Wireframe,
ID_SmoothFramerate,
ID_BirdsEyeView,
ID_Fullscreen,
ID_CameraReset,
ID_MessageTrace,
@@ -392,6 +393,7 @@ wxBEGIN_EVENT_TABLE(ScenarioEditor, wxFrame)
EVT_MENU(ID_Wireframe, ScenarioEditor::OnWireframe)
EVT_MENU(ID_SmoothFramerate, ScenarioEditor::OnSmoothFramerate)
EVT_MENU(ID_BirdsEyeView, ScenarioEditor::OnBirdsEyeView)
EVT_MENU(ID_Fullscreen, ScenarioEditor::OnFullscreen)
EVT_MENU(ID_CameraReset, ScenarioEditor::OnCameraReset)
EVT_MENU(ID_MessageTrace, ScenarioEditor::OnMessageTrace)
@@ -510,8 +512,7 @@ ScenarioEditor::ScenarioEditor(wxWindow* parent)
menuView->AppendCheckItem(ID_Wireframe, _("&Wireframe"));
menuView->AppendCheckItem(ID_SmoothFramerate, _("Smooth framerate"));
menuView->AppendCheckItem(ID_BirdsEyeView, _("&Birds Eye View\tCtrl+B"));
auto* fullscreenItem = menuView->AppendCheckItem(wxID_ANY, _("&Fullscreen\tAlt+Enter"));
this->Bind(wxEVT_MENU, [this, fullscreenItem](auto&){ SetFullscreen(fullscreenItem->IsChecked()); });
menuView->AppendCheckItem(ID_Fullscreen, _("&Fullscreen\tAlt+Enter"));
menuView->Append(ID_CameraReset, _("&Reset camera"));
}
@@ -1001,9 +1002,9 @@ void ScenarioEditor::OnBirdsEyeView(wxCommandEvent& event)
POST_MESSAGE(SetBirdsEyeView, (event.IsChecked()));
}
void ScenarioEditor::SetFullscreen(const bool enabled)
void ScenarioEditor::OnFullscreen(wxCommandEvent& event)
{
ShowFullScreen(enabled, wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
ShowFullScreen(event.IsChecked(), wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
}
void ScenarioEditor::OnDumpState(wxCommandEvent& event)
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
void OnWireframe(wxCommandEvent& event);
void OnSmoothFramerate(wxCommandEvent& event);
void OnBirdsEyeView(wxCommandEvent& event);
void SetFullscreen(const bool enabled);
void OnFullscreen(wxCommandEvent& event);
void OnCameraReset(wxCommandEvent& event);
void OnMessageTrace(wxCommandEvent& event);