Browse Source

More careful UI creation

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
0c7c99c8fc
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 15 additions and 10 deletions
  1. +1
    -1
      dpf
  2. +14
    -4
      src/CardinalUI.cpp
  3. +0
    -5
      src/override/Window.cpp

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 62996d5578702fde52e309528d6a4a894a7b3997
Subproject commit 497a831bd9ac0a9f28b581ea58fe8bfc0f95fff1

+ 14
- 4
src/CardinalUI.cpp View File

@@ -109,18 +109,28 @@ public:
if (scaleFactor != 1)
setSize(1228 * scaleFactor, 666 * scaleFactor);

fContext->window = new rack::window::Window;
rack::window::Window* const window = new rack::window::Window;
rack::window::WindowInit(window, this);

{
const ScopedContext sc(this);
rack::window::WindowInit(fContext->window, this);
const MutexLocker cml(fContext->mutex);
rack::contextSet(fContext);

fContext->scene->removeChild(fContext->scene->menuBar);
fContext->scene->menuBar = rack::app::createMenuBar(getWindow(), getApp().isStandalone());
fContext->scene->addChildBelow(fContext->scene->menuBar, fContext->scene->rackScroll);

fContext->window = window;

rack::widget::Widget::ContextCreateEvent e;
fContext->scene->onContextCreate(e);

window->step();

rack::contextSet(nullptr);
}

WindowParametersSetCallback(fContext->window, this);
WindowParametersSetCallback(window, this);
}

~CardinalUI() override


+ 0
- 5
src/override/Window.cpp View File

@@ -148,11 +148,6 @@ void WindowInit(Window* const window, DISTRHO_NAMESPACE::UI* const ui)

// Init settings
WindowParametersRestore(window);

if (APP->scene) {
widget::Widget::ContextCreateEvent e;
APP->scene->onContextCreate(e);
}
}

void WindowMods(Window* const window, const int mods)


Loading…
Cancel
Save