Removed "USE_IMGUI" option, removed legacy popup and keybindings UI c…

…ode. (#72937)
CleverRaven · Apr 11, 2024 · e46636b · e46636b
1 parent eb3b3c1
commit e46636b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 707 deletions.
diff --git a/src/cata_imgui.cpp b/src/cata_imgui.cpp
@@ -488,11 +488,13 @@ cataimgui::window::window( const std::string &id_, int window_flags ) : window(
 
 cataimgui::window::~window()
 {
-    ImGui::ClearWindowSettings( id.c_str() );
     p_impl.reset();
-    if( !ui_adaptor::has_imgui() ) {
-        ImGui::GetIO().ClearInputKeys();
-        GImGui->InputEventsQueue.resize( 0 );
+    if( GImGui ) {
+        ImGui::ClearWindowSettings( id.c_str() );
+        if( !ui_adaptor::has_imgui() ) {
+            ImGui::GetIO().ClearInputKeys();
+            GImGui->InputEventsQueue.resize( 0 );
+        }
     }
 }
 

diff --git a/src/input_context.cpp b/src/input_context.cpp
diff --git a/src/input_context.h b/src/input_context.h
@@ -478,9 +478,6 @@ class input_context
          */
         std::vector<std::string> filter_strings_by_phrase( const std::vector<std::string> &strings,
                 std::string_view phrase ) const;
-
-        action_id display_menu_legacy( bool permit_execute_action );
-        action_id display_menu_imgui( bool permit_execute_action );
 };
 
 class hotkey_queue

diff --git a/src/main_menu.cpp b/src/main_menu.cpp
@@ -571,9 +571,7 @@ void main_menu::init_strings()
     vSettingsSubItems.emplace_back( pgettext( "Main Menu|Settings", "A<u|U>topickup" ) );
     vSettingsSubItems.emplace_back( pgettext( "Main Menu|Settings", "Sa<f|F>emode" ) );
     vSettingsSubItems.emplace_back( pgettext( "Main Menu|Settings", "Colo<r|R>s" ) );
-    if( get_options().has_option( "USE_IMGUI" ) && get_option<bool>( "USE_IMGUI" ) ) {
-        vSettingsSubItems.emplace_back( pgettext( "Main Menu|Settings", "<I|i>mGui Demo Screen" ) );
-    }
+    vSettingsSubItems.emplace_back( pgettext( "Main Menu|Settings", "<I|i>mGui Demo Screen" ) );
 
     vSettingsHotkeys.clear();
     for( const std::string &item : vSettingsSubItems ) {
@@ -920,10 +918,8 @@ bool main_menu::opening_screen()
                     } else if( sel2 == 4 ) { /// Colors
                         all_colors.show_gui();
                     } else if( sel2 == 5 ) { /// ImGui demo
-                        if( get_options().has_option( "USE_IMGUI" ) && get_option<bool>( "USE_IMGUI" ) ) {
-                            demo_ui demo;
-                            demo.run();
-                        }
+                        demo_ui demo;
+                        demo.run();
                     }
                     break;
                 case main_menu_opts::WORLD:

diff --git a/src/options.cpp b/src/options.cpp
@@ -1753,10 +1753,6 @@ void options_manager::add_options_interface()
         this->add_empty_line( "interface" );
     };
 
-    add( "USE_IMGUI", "interface", to_translation( "Use ImGui UI" ),
-         to_translation( "Use new ImGui-based user interface (WARNING: EXPERIMENTAL)." ),
-         false );
-
     add_empty_line();
 
     add( "USE_LANG", "interface", to_translation( "Language" ),