Merge branch 'develop' into debugger

This commit is contained in:
Martín Lucas Golini
2024-12-19 19:16:55 -03:00
2 changed files with 4 additions and 1 deletions

View File

@@ -27,7 +27,7 @@
--tab-hover: #334e5e;
--tab-close: #909396;
--tab-close-hover: #863d47;
--tab-font-inactive: #b6bbc2;
--tab-font-inactive: #c0c5cc;
--icon: #b6bbc2;
--icon-active: white;
--icon-back-hover: #eff0f1;

View File

@@ -1053,14 +1053,17 @@ UIMenu* SettingsMenu::createEditMenu() {
UIMenu* SettingsMenu::createWindowMenu() {
mWindowMenu = UIPopUpMenu::New();
auto shouldCloseCb = []( UIMenuItem* ) -> bool { return false; };
UIPopUpMenu* colorsMenu = UIPopUpMenu::New();
colorsMenu
->addRadioButton( i18n( "light", "Light" ),
mApp->getUIColorScheme() == ColorSchemePreference::Light )
->setOnShouldCloseCb( shouldCloseCb )
->setId( "light" );
colorsMenu
->addRadioButton( i18n( "dark", "Dark" ),
mApp->getUIColorScheme() == ColorSchemePreference::Dark )
->setOnShouldCloseCb( shouldCloseCb )
->setId( "dark" );
colorsMenu->on( Event::OnItemClicked, [this]( const Event* event ) {
if ( !event->getNode()->isType( UI_TYPE_MENUITEM ) )