ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Use only one option for settings window (#1122) 

* rebase code

* remove unsused item

* restore "system" displaying on first boot

* restore popup menu functions (separate commit)

* restore snapshot function in popup menu

* get current index value from config file
This commit is contained in:
Fabx 2023-11-19 20:16:06 +01:00 committed by GitHub
parent b3fc80b3a8
commit b605381adb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/xui/main-menu.cc
View File

@ -1184,34 +1184,21 @@ MainMenuScene::MainMenuScene()
m_next_view_index = m_current_view_index; m_next_view_index = m_current_view_index;
} }
void MainMenuScene::ShowGeneral() void MainMenuScene::ShowSettings()
{ {
SetNextViewIndexWithFocus(0); SetNextViewIndexWithFocus(g_config.general.last_viewed_menu_index);
}
void MainMenuScene::ShowInput()
{
SetNextViewIndexWithFocus(1);
}
void MainMenuScene::ShowDisplay()
{
SetNextViewIndexWithFocus(2);
}
void MainMenuScene::ShowAudio()
{
SetNextViewIndexWithFocus(3);
}
void MainMenuScene::ShowNetwork()
{
SetNextViewIndexWithFocus(4);
} }
void MainMenuScene::ShowSnapshots() void MainMenuScene::ShowSnapshots()
{ {
SetNextViewIndexWithFocus(5); SetNextViewIndexWithFocus(5);
} }
void MainMenuScene::ShowSystem() void MainMenuScene::ShowSystem()
{ {
SetNextViewIndexWithFocus(6); SetNextViewIndexWithFocus(6);
} }
void MainMenuScene::ShowAbout() void MainMenuScene::ShowAbout()
{ {
SetNextViewIndexWithFocus(7); SetNextViewIndexWithFocus(7);

8
ui/xui/main-menu.hh
View File

@ -182,14 +182,10 @@ protected:
public: public:
MainMenuScene(); MainMenuScene();
void ShowGeneral(); void ShowSettings();
void ShowInput();
void ShowDisplay();
void ShowAudio();
void ShowNetwork();
void ShowSnapshots();
void ShowSystem(); void ShowSystem();
void ShowAbout(); void ShowAbout();
void ShowSnapshots();
void SetNextViewIndexWithFocus(int i); void SetNextViewIndexWithFocus(int i);
void Show() override; void Show() override;
void Hide() override; void Hide() override;

9
ui/xui/menubar.cc
View File

@ -138,14 +138,7 @@ void ShowMainMenu()
ImGui::Separator(); ImGui::Separator();
ImGui::MenuItem("Settings", NULL, false, false); if (ImGui::MenuItem("Settings...")) g_main_menu.ShowSettings();
if (ImGui::MenuItem(" General")) g_main_menu.ShowGeneral();
if (ImGui::MenuItem(" Input")) g_main_menu.ShowInput();
if (ImGui::MenuItem(" Display")) g_main_menu.ShowDisplay();
if (ImGui::MenuItem(" Audio")) g_main_menu.ShowAudio();
if (ImGui::MenuItem(" Network")) g_main_menu.ShowNetwork();
if (ImGui::MenuItem(" Snapshots")) g_main_menu.ShowSnapshots();
if (ImGui::MenuItem(" System")) g_main_menu.ShowSystem();
ImGui::Separator(); ImGui::Separator();