mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: [STUDIO-3895] enable mac window menu 

Change-Id: Icd53c6866e9108f960aa52e54e518efc5def7101
This commit is contained in:
chunmao.guo 2023-08-10 15:23:04 +08:00 committed by Lane.Wei
parent 3c01e937f8
commit 163ff38c3b
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/MainFrame.cpp
View File

@ -2211,7 +2211,6 @@ static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame,
void MainFrame::init_menubar_as_editor() void MainFrame::init_menubar_as_editor()
{ {
#ifdef __APPLE__ #ifdef __APPLE__
wxMenuBar::SetAutoWindowMenu(false);
m_menubar = new wxMenuBar(); m_menubar = new wxMenuBar();
#endif #endif
@ -2610,6 +2609,14 @@ void MainFrame::init_menubar_as_editor()
wxWindowID bambu_studio_id_base = wxWindow::NewControlId(int(2)); wxWindowID bambu_studio_id_base = wxWindow::NewControlId(int(2));
wxMenu* parent_menu = m_menubar->OSXGetAppleMenu(); wxMenu* parent_menu = m_menubar->OSXGetAppleMenu();
//auto preference_item = new wxMenuItem(parent_menu, BambuStudioMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", ""); //auto preference_item = new wxMenuItem(parent_menu, BambuStudioMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", "");
std::string app_items[] = {
L("Services"),
L("Hide BambuStudio"),
L("Hide Others"),
L("Show All"),
L("Quit BambuStudio")
};
#else #else
wxMenu* parent_menu = m_topbar->GetTopMenu(); wxMenu* parent_menu = m_topbar->GetTopMenu();
auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\t" + ctrl + "P", ""); auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\t" + ctrl + "P", "");
@ -2952,6 +2959,17 @@ void MainFrame::init_menubar_as_editor()
}, },
this); this);
m_menubar->Append(new wxMenu(), L("Window"));
std::string window_items[] = {
L("Minimize"),
L("Zoom"),
L("Tile Window to Left of Screen"),
L("Tile Window to Right of Screen"),
L("Replace Tiled Window"),
L("Remove Window from Set"),
L("Bring All to Front")
};
if (helpMenu) if (helpMenu)
m_menubar->Append(helpMenu, wxString::Format("&%s", _L("Help"))); m_menubar->Append(helpMenu, wxString::Format("&%s", _L("Help")));
SetMenuBar(m_menubar); SetMenuBar(m_menubar);