zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the "show menu bar" option. 

Hiding the menu bar was only supported on macOS, and it is inherently
troublesome to port because keyboard accelerators on Win32 and GTK
are inherently dependent on the menu bar being visible.

On top of that, it's not clear how to bring it back if it's hidden
by accident.
pull/200/head
whitequark 2017-02-06 15:11:50 +00:00
parent 6cf5409cd7
commit d77f617dc4
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphicswin.cpp
View File

@ -76,9 +76,6 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = {
{ 1, N_("Show Snap &Grid"), Command::SHOW_GRID, '>', TC, mView }, { 1, N_("Show Snap &Grid"), Command::SHOW_GRID, '>', TC, mView },
{ 1, N_("Use &Perspective Projection"), Command::PERSPECTIVE_PROJ, '`', TC, mView }, { 1, N_("Use &Perspective Projection"), Command::PERSPECTIVE_PROJ, '`', TC, mView },
{ 1, NULL, Command::NONE, 0, TN, NULL }, { 1, NULL, Command::NONE, 0, TN, NULL },
#if defined(__APPLE__)
{ 1, N_("Show Menu &Bar"), Command::SHOW_MENU_BAR, C|F(12), TC, mView },
#endif
{ 1, N_("Show &Toolbar"), Command::SHOW_TOOLBAR, 0, TC, mView }, { 1, N_("Show &Toolbar"), Command::SHOW_TOOLBAR, 0, TC, mView },
{ 1, N_("Show Property Bro&wser"), Command::SHOW_TEXT_WND, '\t', TC, mView }, { 1, N_("Show Property Bro&wser"), Command::SHOW_TEXT_WND, '\t', TC, mView },
{ 1, NULL, Command::NONE, 0, TN, NULL }, { 1, NULL, Command::NONE, 0, TN, NULL },
@ -585,12 +582,6 @@ void GraphicsWindow::MenuView(Command id) {
} }
break; break;
case Command::SHOW_MENU_BAR:
ToggleMenuBar();
SS.GW.EnsureValidActives();
InvalidateGraphics();
break;
case Command::SHOW_TOOLBAR: case Command::SHOW_TOOLBAR:
SS.showToolbar = !SS.showToolbar; SS.showToolbar = !SS.showToolbar;
SS.GW.EnsureValidActives(); SS.GW.EnsureValidActives();
@ -691,9 +682,6 @@ void GraphicsWindow::EnsureValidActives() {
ShowTextWindow(SS.GW.showTextWindow); ShowTextWindow(SS.GW.showTextWindow);
CheckMenuByCmd(Command::SHOW_TEXT_WND, /*checked=*/SS.GW.showTextWindow); CheckMenuByCmd(Command::SHOW_TEXT_WND, /*checked=*/SS.GW.showTextWindow);
#if defined(__APPLE__)
CheckMenuByCmd(Command::SHOW_MENU_BAR, /*checked=*/MenuBarIsVisible());
#endif
CheckMenuByCmd(Command::SHOW_TOOLBAR, /*checked=*/SS.showToolbar); CheckMenuByCmd(Command::SHOW_TOOLBAR, /*checked=*/SS.showToolbar);
CheckMenuByCmd(Command::PERSPECTIVE_PROJ, /*checked=*/SS.usePerspectiveProj); CheckMenuByCmd(Command::PERSPECTIVE_PROJ, /*checked=*/SS.usePerspectiveProj);
CheckMenuByCmd(Command::SHOW_GRID,/*checked=*/SS.GW.showSnapGrid); CheckMenuByCmd(Command::SHOW_GRID,/*checked=*/SS.GW.showSnapGrid);

1
src/ui.h
View File

@ -142,7 +142,6 @@ enum class Command : uint32_t {
NEAREST_ORTHO, NEAREST_ORTHO,
NEAREST_ISO, NEAREST_ISO,
CENTER_VIEW, CENTER_VIEW,
SHOW_MENU_BAR,
SHOW_TOOLBAR, SHOW_TOOLBAR,
SHOW_TEXT_WND, SHOW_TEXT_WND,
UNITS_INCHES, UNITS_INCHES,