Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-18 11:33:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/ecode-settings-panel

Browse Source 
# Conflicts:
#	src/tools/ecode/settingsmenu.cpp
This commit is contained in:
Martín Lucas Golini
2026-08-24 19:20:47 -03:00
parent c97aff1e96 55ad998de1
commit 43dec0ffb5
25 changed files with 885 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/ecode/ecode.cpp
+2 -1
View File
@@ -4689,7 +4689,6 @@ void App::init( InitParameters& params ) {
EE_PLATFORM == EE_PLATFORM_BSD
#if EE_PLATFORM == EE_PLATFORM_MACOS
macOS_createApplicationMenus();
macOS_enableScrollMomentum();
macOS_removeTitleBarSeparator( mWindow->getWindowHandler() );
#endif
@@ -5144,6 +5143,8 @@ void App::init( InitParameters& params ) {
mSettings = std::make_unique<SettingsMenu>();
mSettings->createSettingsMenu( this, mMenuBar );
if ( mMenuBar->isGlobalMenuBarSupported() )
mMenuBar->setGlobalMenuBarEnabled( true );
mSplitter->createEditorWithTabWidget( mBaseLayout );