GUI: put "OK" and "Cancel" buttons in the bottom

This commit is contained in:
tildearrow 2022-05-03 01:48:57 -05:00
parent 31a35e5395
commit c23ee8e7c9

View file

@ -225,6 +225,9 @@ void FurnaceGUI::drawSettings() {
} }
if (ImGui::BeginTabBar("settingsTab")) { if (ImGui::BeginTabBar("settingsTab")) {
if (ImGui::BeginTabItem("General")) { if (ImGui::BeginTabItem("General")) {
ImVec2 settingsViewSize=ImGui::GetContentRegionAvail();
settingsViewSize.y-=ImGui::GetFrameHeight()+ImGui::GetStyle().WindowPadding.y;
if (ImGui::BeginChild("SettingsView",settingsViewSize)) {
ImGui::Text("Workspace layout:"); ImGui::Text("Workspace layout:");
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Import")) { if (ImGui::Button("Import")) {
@ -498,10 +501,14 @@ void FurnaceGUI::drawSettings() {
if (ImGui::RadioButton("Move to effect value/next effect and wrap around##eicb2",settings.effectCursorDir==2)) { if (ImGui::RadioButton("Move to effect value/next effect and wrap around##eicb2",settings.effectCursorDir==2)) {
settings.effectCursorDir=2; settings.effectCursorDir=2;
} }
}
ImGui::EndChild();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
if (ImGui::BeginTabItem("Audio/MIDI")) { if (ImGui::BeginTabItem("Audio/MIDI")) {
ImVec2 settingsViewSize=ImGui::GetContentRegionAvail();
settingsViewSize.y-=ImGui::GetFrameHeight()+ImGui::GetStyle().WindowPadding.y;
if (ImGui::BeginChild("SettingsView",settingsViewSize)) {
ImGui::Text("Backend"); ImGui::Text("Backend");
ImGui::SameLine(); ImGui::SameLine();
ImGui::Combo("##Backend",&settings.audioEngine,audioBackends,2); ImGui::Combo("##Backend",&settings.audioEngine,audioBackends,2);
@ -848,10 +855,14 @@ void FurnaceGUI::drawSettings() {
ImGui::TreePop(); ImGui::TreePop();
} }
}
ImGui::EndChild();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
if (ImGui::BeginTabItem("Emulation")) { if (ImGui::BeginTabItem("Emulation")) {
ImVec2 settingsViewSize=ImGui::GetContentRegionAvail();
settingsViewSize.y-=ImGui::GetFrameHeight()+ImGui::GetStyle().WindowPadding.y;
if (ImGui::BeginChild("SettingsView",settingsViewSize)) {
ImGui::Text("Arcade/YM2151 core"); ImGui::Text("Arcade/YM2151 core");
ImGui::SameLine(); ImGui::SameLine();
ImGui::Combo("##ArcadeCore",&settings.arcadeCore,arcadeCores,2); ImGui::Combo("##ArcadeCore",&settings.arcadeCore,arcadeCores,2);
@ -871,10 +882,14 @@ void FurnaceGUI::drawSettings() {
ImGui::Text("FDS core"); ImGui::Text("FDS core");
ImGui::SameLine(); ImGui::SameLine();
ImGui::Combo("##FDSCore",&settings.fdsCore,nesCores,2); ImGui::Combo("##FDSCore",&settings.fdsCore,nesCores,2);
}
ImGui::EndChild();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
if (ImGui::BeginTabItem("Appearance")) { if (ImGui::BeginTabItem("Appearance")) {
ImVec2 settingsViewSize=ImGui::GetContentRegionAvail();
settingsViewSize.y-=ImGui::GetFrameHeight()+ImGui::GetStyle().WindowPadding.y;
if (ImGui::BeginChild("SettingsView",settingsViewSize)) {
bool dpiScaleAuto=(settings.dpiScale<0.5f); bool dpiScaleAuto=(settings.dpiScale<0.5f);
if (ImGui::Checkbox("Automatic UI scaling factor",&dpiScaleAuto)) { if (ImGui::Checkbox("Automatic UI scaling factor",&dpiScaleAuto)) {
if (dpiScaleAuto) { if (dpiScaleAuto) {
@ -1360,10 +1375,14 @@ void FurnaceGUI::drawSettings() {
} }
ImGui::TreePop(); ImGui::TreePop();
} }
}
ImGui::EndChild();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
if (ImGui::BeginTabItem("Keyboard")) { if (ImGui::BeginTabItem("Keyboard")) {
ImVec2 settingsViewSize=ImGui::GetContentRegionAvail();
settingsViewSize.y-=ImGui::GetFrameHeight()+ImGui::GetStyle().WindowPadding.y;
if (ImGui::BeginChild("SettingsView",settingsViewSize)) {
if (ImGui::Button("Import")) { if (ImGui::Button("Import")) {
openFileDialog(GUI_FILE_IMPORT_KEYBINDS); openFileDialog(GUI_FILE_IMPORT_KEYBINDS);
} }
@ -1703,6 +1722,8 @@ void FurnaceGUI::drawSettings() {
KEYBIND_CONFIG_END; KEYBIND_CONFIG_END;
ImGui::TreePop(); ImGui::TreePop();
} }
}
ImGui::EndChild();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
ImGui::EndTabBar(); ImGui::EndTabBar();