From 39addfc438cc3010be2f96db67d854874ca1b5d8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 22 Jan 2022 01:29:47 +0000 Subject: [PATCH] Ildaeil: small things for syncing code with main project Signed-off-by: falkTX --- plugins/Cardinal/src/Ildaeil.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/plugins/Cardinal/src/Ildaeil.cpp b/plugins/Cardinal/src/Ildaeil.cpp index f0d3fc2..68e02e5 100644 --- a/plugins/Cardinal/src/Ildaeil.cpp +++ b/plugins/Cardinal/src/Ildaeil.cpp @@ -748,8 +748,8 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread { if (module->fCarlaHostHandle == nullptr) { fDrawingState = kDrawingErrorInit; - fPopupError = "Ildaeil backend failed to init properly, cannot continue."; fIdleState = kIdleNothing; + fPopupError = "Ildaeil backend failed to init properly, cannot continue."; return; } @@ -859,6 +859,13 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread { setDirty(true); } + void hidePluginUI(const CarlaHostHandle handle) + { + DISTRHO_SAFE_ASSERT_RETURN(fPluginRunning,); + + carla_show_custom_ui(handle, 0, false); + } + void createPluginGenericUI(const CarlaHostHandle handle, const CarlaPluginInfo* const info) { PluginGenericUI* const ui = new PluginGenericUI; @@ -1470,7 +1477,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread { ImGui::CloseCurrentPopup(); ImGui::SameLine(); - ImGui::Dummy(ImVec2(500, 1)); + ImGui::Dummy(ImVec2(500 * getScaleFactor(), 1)); ImGui::EndPopup(); } else if (fPluginSearchFirstShow) @@ -1483,6 +1490,9 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread { ImGuiInputTextFlags_CharsNoBlank|ImGuiInputTextFlags_AutoSelectAll)) fPluginSearchActive = true; + if (ImGui::IsKeyDown(ImGuiKey_Escape)) + fPluginSearchActive = false; + ImGui::SameLine(); ImGui::PushItemWidth(-1.0f); @@ -1511,9 +1521,6 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread { } } - if (ImGui::IsKeyDown(ImGuiKey_Escape)) - fPluginSearchActive = false; - ImGui::BeginDisabled(!fPluginScanningFinished || fPluginSelected < 0); if (ImGui::Button("Load Plugin"))