Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UX: use only one option for settings window #1122

Merged
merged 6 commits into from
Nov 19, 2023
Merged

UX: use only one option for settings window #1122

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85fe13d
rebase code
Fabxx Aug 3, 2023
a30b778
remove unsused item
Fabxx Aug 3, 2023
18baa7b
restore "system" displaying on first boot
Fabxx Nov 6, 2023
798bd0f
restore popup menu functions (separate commit)
Fabxx Nov 12, 2023
505dbf0
restore snapshot function in popup menu
Fabxx Nov 12, 2023
6fc2f8b
get current index value from config file
Fabxx Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions ui/xui/main-menu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,37 +1184,9 @@ MainMenuScene::MainMenuScene()
m_next_view_index = m_current_view_index;
}

void MainMenuScene::ShowGeneral()
void MainMenuScene::ShowSettings()
{
SetNextViewIndexWithFocus(0);
}
void MainMenuScene::ShowInput()
{
SetNextViewIndexWithFocus(1);
}
void MainMenuScene::ShowDisplay()
{
SetNextViewIndexWithFocus(2);
}
void MainMenuScene::ShowAudio()
{
SetNextViewIndexWithFocus(3);
}
void MainMenuScene::ShowNetwork()
{
SetNextViewIndexWithFocus(4);
}
void MainMenuScene::ShowSnapshots()
{
SetNextViewIndexWithFocus(5);
}
void MainMenuScene::ShowSystem()
{
SetNextViewIndexWithFocus(6);
}
void MainMenuScene::ShowAbout()
{
SetNextViewIndexWithFocus(7);
SetNextViewIndexWithFocus(m_current_view_index);
}

void MainMenuScene::SetNextViewIndexWithFocus(int i)
Expand Down
9 changes: 1 addition & 8 deletions ui/xui/main-menu.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,7 @@ protected:

public:
MainMenuScene();
void ShowGeneral();
void ShowInput();
void ShowDisplay();
void ShowAudio();
void ShowNetwork();
void ShowSnapshots();
void ShowSystem();
void ShowAbout();
void ShowSettings();
void SetNextViewIndexWithFocus(int i);
void Show() override;
void Hide() override;
Expand Down
10 changes: 1 addition & 9 deletions ui/xui/menubar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,7 @@ void ShowMainMenu()

ImGui::Separator();

ImGui::MenuItem("Settings", NULL, false, false);
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();
if (ImGui::MenuItem("Settings...")) g_main_menu.ShowSettings();

ImGui::Separator();

Expand Down Expand Up @@ -231,7 +224,6 @@ void ShowMainMenu()
#endif

ImGui::Separator();
if (ImGui::MenuItem("About")) g_main_menu.ShowAbout();
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
ImGui::EndMenu();
}

Expand Down
5 changes: 0 additions & 5 deletions ui/xui/popup-menu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,6 @@ class SettingsPopupMenu : public virtual PopupMenu {
nav.PushFocus();
nav.PushMenu(aspect_ratio);
}
if (PopupMenuButton("Snapshots...", ICON_FA_CLOCK_ROTATE_LEFT)) {
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
nav.ClearMenuStack();
g_scene_mgr.PushScene(g_main_menu);
g_main_menu.ShowSnapshots();
}
if (PopupMenuButton("All settings...", ICON_FA_SLIDERS)) {
nav.ClearMenuStack();
g_scene_mgr.PushScene(g_main_menu);
Expand Down
2 changes: 1 addition & 1 deletion ui/xui/welcome.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void FirstBootWindow::Draw()

ImGui::SetCursorPosX((ImGui::GetWindowWidth()-120*g_viewport_mgr.m_scale)/2);
if (ImGui::Button("Settings", ImVec2(120*g_viewport_mgr.m_scale, 0))) {
g_main_menu.ShowSystem();
Fabxx marked this conversation as resolved.
Show resolved Hide resolved
g_main_menu.ShowSettings();
g_config.general.show_welcome = false;
}

Expand Down