github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-11 06:12:34 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Now with macstyle menu

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12610 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-12-09 17:32:27 +00:00
parent ef4e165897
commit be24ef46ce
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlLib/MacMenu.mm
View file

@ -100,6 +100,7 @@ void CocoMenuBar::Set(Event<Bar&> bar)
{
if(lock) return;
lock++;
[cocomenu removeAllItems];
bar(*this);
lock--;
}

2
uppsrc/ide/Builders/GccBuilder.cpp
View file

@ -569,7 +569,7 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
<< "<plist version=\"1.0\">\n"
<< "<dict>\n"
<< " <key>CFBundleExecutable</key>\n"
<< " <string>Test" << GetFileName(target) << "</string>\n"
<< " <string>" << GetFileName(target) << "</string>\n"
<< " <key>NSHighResolutionCapable</key>\n"
<< " <string>True</string>\n"
<< " <key>LSMinimumSystemVersion</key>\n"

5
uppsrc/ide/idebar.cpp
View file

@ -871,7 +871,12 @@ void Ide::SetBar()
void Ide::SetMenuBar()
{
#ifdef PLATFORM_COCOA
SetMainMenu(THISBACK(MainMenu));
menubar.Hide();
#else
menubar.Set(THISBACK(MainMenu));
#endif
}
void Ide::SetToolBar()

9
uppsrc/ide/idewin.cpp
View file

@ -325,6 +325,14 @@ void Ide::SetupBars()
ClearFrames();
int r = HorzLayoutZoom(170);
int l = HorzLayoutZoom(350);
#ifdef PLATFORM_COCOA
int tcy = max(mainconfiglist.GetStdSize().cy + DPI(2), toolbar.GetStdHeight());
bararea.Add(toolbar.HSizePos(0, r).VCenterPos(tcy));
bararea.Add(display.RightPos(4, r).VSizePos(2, 3));
bararea.Height(tcy);
AddFrame(bararea);
toolbar.NoTransparent();
#else
menubar.Transparent();
if(toolbar_in_row) {
toolbar.SetFrame(NullFrame());
@ -345,6 +353,7 @@ void Ide::SetupBars()
AddFrame(toolbar);
toolbar.NoTransparent();
}
#endif
AddFrame(statusbar);
SetBar();
}