Last commit before vAmiga integration

Author: dartfnm

libs/amDebugger/src/amDebugger/debuggerWndApp.cpp

@@ -167,13 +167,8 @@ bool DebuggerApp::isWndVisible() const
 {
     uint32_t window_flags = SDL_GetWindowFlags(m_pWindow);
     if (window_flags & (SDL_WINDOW_HIDDEN | SDL_WINDOW_MINIMIZED))
-    {
         return false;
-    }
-    else
-    {
-        return true;
-    }
+    return true;
 }
 
 

src/quasar_app/ui/uae_options_wnd.cpp

@@ -18,6 +18,7 @@
 #include "qd/qui/uiMessages.h"
 #include "qd/stl/algorithm.h"
 #include "qd/stl/string.h"
+#include "quaesar_config.h"
 
 
 namespace qsr {
@@ -198,22 +199,28 @@ void UaeOptionsDlg::onUiNodeCreated(qd::UiNodeCreator* mk) {
     setSize({600, 400});
 
     UCategory* pCat;
-
     createCategory(EOptionCat::UNDEF, EOptionCat::ROOT);
+
     if (pCat = createCategory(EOptionCat::QUICK_START, EOptionCat::ROOT)) {
         pCat->title = "Quick Start Options";
     }
 
     //     /*UCategory* pCatHW =*/createCategory(EOptionCat::HARDWARE, EOptionCat::ROOT);
-    //     /*UCategory* pCatHost =*/createCategory(EOptionCat::HOST, EOptionCat::ROOT);
+
+    if (pCat = createCategory(EOptionCat::HOST, EOptionCat::ROOT)) {
+        pCat->title = "Main options";
+        createOption(pCat)->setDrawCb(
+            [](OptionDrawCtx*) { ImGui::Checkbox("Use ESC key to Quit", &g_cfg_main->quitByEsc); });
+    }
+
     //     /*UCategory* pCatCpu =*/createCategory(EOptionCat::CPU, EOptionCat::HARDWARE);
 
-    if (UCategory* pCat = createCategory(EOptionCat::FLOPPY, EOptionCat::HARDWARE)) {
+    if (pCat = createCategory(EOptionCat::FLOPPY, EOptionCat::HARDWARE)) {
         pCat->title = "Floppy Drives Options";
-        createOption(pCat, "Floppy 0")->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 0); });
-        createOption(pCat, "Floppy 1")->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 1); });
-        createOption(pCat, "Floppy 2")->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 2); });
-        createOption(pCat, "Floppy 3")->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 3); });
+        createOption(pCat)->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 0); });
+        createOption(pCat)->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 1); });
+        createOption(pCat)->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 2); });
+        createOption(pCat)->setDrawCb([](OptionDrawCtx* ctx) { draw_opt_floppy_cfg(ctx, 3); });
     }
 }
 

src/quasar_app/ui/uae_options_wnd.h

@@ -48,13 +48,11 @@ struct OptionDrawCtx {
 
 struct UOption {
 public:
-    qd::string title;
     UCategory* parentCat = nullptr;
     using TDrawOptionCb = eastl::fixed_function<2 * sizeof(void*), void(OptionDrawCtx*)>;
     TDrawOptionCb drawOptionCb;
 
-    UOption(const char* title) : title(title) {
-    }
+    UOption() = default;
 
     UOption& setDrawCb(UOption::TDrawOptionCb&& cb) {
         drawOptionCb = std::move(cb);