Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 01:56:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue SpartanJ/ecode#242. Improve popup menu positioning and reduce main menu size. I'll continue redesigning menus later.

Browse Source 
Tentative fix for SpartanJ/ecode#219.
This commit is contained in:
Martín Lucas Golini
2024-04-05 00:15:09 -03:00
parent a02b12c495
commit 642fec60e4
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/tools/ecode/settingsmenu.cpp
View File

@@ -73,31 +73,6 @@ void SettingsMenu::createSettingsMenu( App* app ) {
getKeybind( "save-all" ) )
->setId( "save-all" );
mSettingsMenu->addSeparator();
UIMenuSubMenu* fileTypeMenu = mSettingsMenu->addSubMenu(
i18n( "file_type", "File Type" ), findIcon( "file-code" ), createFileTypeMenu() );
fileTypeMenu->on( Event::OnMenuShow, [this, fileTypeMenu]( const Event* ) {
if ( mFileTypeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) {
for ( UIPopUpMenu* menu : mFileTypeMenues )
menu->close();
mFileTypeMenues.clear();
auto* newMenu = createFileTypeMenu();
newMenu->reloadStyle( true, true );
fileTypeMenu->setSubMenu( newMenu );
}
} );
UIMenuSubMenu* colorSchemeMenu =
mSettingsMenu->addSubMenu( i18n( "syntax_color_scheme", "Syntax Color Scheme" ),
findIcon( "palette" ), createColorSchemeMenu() );
colorSchemeMenu->on( Event::OnMenuShow, [this, colorSchemeMenu]( const Event* ) {
if ( mColorSchemeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) {
for ( UIPopUpMenu* menu : mColorSchemeMenues )
menu->close();
mColorSchemeMenues.clear();
auto* newMenu = createColorSchemeMenu();
newMenu->reloadStyle( true, true );
colorSchemeMenu->setSubMenu( newMenu );
}
} );
mProjectMenu = UIPopUpMenu::New();
mSettingsMenu
@@ -245,6 +220,20 @@ UIMenu* SettingsMenu::createDocumentMenu() {
mApp->getConfig().doc.autoDetectIndentType )
->setId( "auto_indent_cur" );
UIMenuSubMenu* fileTypeMenu = mDocMenu->addSubMenu(
i18n( "file_type", "File Type" ), findIcon( "file-code" ), createFileTypeMenu() );
fileTypeMenu->on( Event::OnMenuShow, [this, fileTypeMenu]( const Event* ) {
if ( mFileTypeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) {
for ( UIPopUpMenu* menu : mFileTypeMenues )
menu->close();
mFileTypeMenues.clear();
auto* newMenu = createFileTypeMenu();
newMenu->reloadStyle( true, true );
fileTypeMenu->setSubMenu( newMenu );
}
} );
UIPopUpMenu* fileEncoding = UIPopUpMenu::New();
auto encodings = TextFormat::encodings();
for ( const auto& enc : encodings )
@@ -391,6 +380,22 @@ UIMenu* SettingsMenu::createDocumentMenu() {
// **** GLOBAL SETTINGS ****
mDocMenu->addSeparator()->setId( "end_current_document" );
UIMenuSubMenu* colorSchemeMenu =
mDocMenu->addSubMenu( i18n( "syntax_color_scheme", "Syntax Color Scheme" ),
findIcon( "palette" ), createColorSchemeMenu() );
colorSchemeMenu->on( Event::OnMenuShow, [this, colorSchemeMenu]( const Event* ) {
if ( mColorSchemeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) {
for ( UIPopUpMenu* menu : mColorSchemeMenues )
menu->close();
mColorSchemeMenues.clear();
auto* newMenu = createColorSchemeMenu();
newMenu->reloadStyle( true, true );
colorSchemeMenu->setSubMenu( newMenu );
}
} );
mDocMenu->addSeparator();
mGlobalMenu = UIPopUpMenu::New();
mDocMenu->addSubMenu( i18n( "global_settings", "Global Settings" ),
findIcon( "global-settings" ), mGlobalMenu );
@@ -1148,6 +1153,7 @@ UIMenu* SettingsMenu::createRendererMenu() {
UIMenu* SettingsMenu::createViewMenu() {
mViewMenu = UIPopUpMenu::New();
mViewMenu->addCheckBox( i18n( "show_line_numbers", "Show Line Numbers" ) )
->setActive( mApp->getConfig().editor.showLineNumbers )
->setId( "show-line-numbers" );