Browse Source

Ildaeil: small things for syncing code with main project

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 4 years ago
parent
commit
39addfc438
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 12 additions and 5 deletions
  1. +12
    -5
      plugins/Cardinal/src/Ildaeil.cpp

+ 12
- 5
plugins/Cardinal/src/Ildaeil.cpp View File

@@ -748,8 +748,8 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
if (module->fCarlaHostHandle == nullptr) if (module->fCarlaHostHandle == nullptr)
{ {
fDrawingState = kDrawingErrorInit; fDrawingState = kDrawingErrorInit;
fPopupError = "Ildaeil backend failed to init properly, cannot continue.";
fIdleState = kIdleNothing; fIdleState = kIdleNothing;
fPopupError = "Ildaeil backend failed to init properly, cannot continue.";
return; return;
} }


@@ -859,6 +859,13 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
setDirty(true); 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) void createPluginGenericUI(const CarlaHostHandle handle, const CarlaPluginInfo* const info)
{ {
PluginGenericUI* const ui = new PluginGenericUI; PluginGenericUI* const ui = new PluginGenericUI;
@@ -1470,7 +1477,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();


ImGui::SameLine(); ImGui::SameLine();
ImGui::Dummy(ImVec2(500, 1));
ImGui::Dummy(ImVec2(500 * getScaleFactor(), 1));
ImGui::EndPopup(); ImGui::EndPopup();
} }
else if (fPluginSearchFirstShow) else if (fPluginSearchFirstShow)
@@ -1483,6 +1490,9 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
ImGuiInputTextFlags_CharsNoBlank|ImGuiInputTextFlags_AutoSelectAll)) ImGuiInputTextFlags_CharsNoBlank|ImGuiInputTextFlags_AutoSelectAll))
fPluginSearchActive = true; fPluginSearchActive = true;


if (ImGui::IsKeyDown(ImGuiKey_Escape))
fPluginSearchActive = false;

ImGui::SameLine(); ImGui::SameLine();
ImGui::PushItemWidth(-1.0f); 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); ImGui::BeginDisabled(!fPluginScanningFinished || fPluginSelected < 0);


if (ImGui::Button("Load Plugin")) if (ImGui::Button("Load Plugin"))


Loading…
Cancel
Save