brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build fixes

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-30 14:49:50 +00:00
parent 5b7e5336c6
commit fec9aef939
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
11 changed files with 36 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CardinalRemote/Makefile
View file

@ -330,8 +330,10 @@ BUILD_CXX_FLAGS += -DCARDINAL_PLUGIN_PREFIX='"$(PREFIX)"'
FILES = main.cpp
FILES += RemoteUI.cpp
FILES += CardinalCommon.cpp
FILES += CardinalRemote.cpp
FILES += common.cpp
FILES += glfw.cpp
FILES += MenuBar.cpp
FILES += Window.cpp
ifeq ($(WINDOWS),true)

18
src/CardinalRemote/RemoteUI.cpp
View file

@ -41,15 +41,6 @@ CardinalRemoteUI::CardinalRemoteUI(Window& window, const std::string& templatePa
rack::window::WindowSetPluginRemote(context->window, this);
if (rack::widget::Widget* const menuBar = context->scene->menuBar)
{
context->scene->removeChild(menuBar);
delete menuBar;
}
context->scene->menuBar = rack::app::createMenuBar(true);
context->scene->addChildBelow(context->scene->menuBar, context->scene->rackScroll);
// hide "Browse VCV Library" button
rack::widget::Widget* const browser = context->scene->browser->children.back();
rack::widget::Widget* const headerLayout = browser->children.front();
@ -93,15 +84,6 @@ CardinalRemoteUI::~CardinalRemoteUI()
context->nativeWindowId = 0;
if (rack::widget::Widget* const menuBar = context->scene->menuBar)
{
context->scene->removeChild(menuBar);
delete menuBar;
}
context->scene->menuBar = rack::app::createMenuBar(true);
context->scene->addChildBelow(context->scene->menuBar, context->scene->rackScroll);
rack::window::WindowSetPluginRemote(context->window, nullptr);
}

9
src/CardinalRemote/RemoteUI.hpp
View file

@ -26,13 +26,10 @@
// --------------------------------------------------------------------------------------------------------------------
namespace rack {
namespace app {
widget::Widget* createMenuBar(bool isStandalone);
}
namespace window {
void WindowSetPluginRemote(Window* window, NanoTopLevelWidget* tlw);
void WindowSetMods(Window* window, int mods);
void WindowSetInternalSize(rack::window::Window* window, math::Vec size);
void WindowSetPluginRemote(Window* window, NanoTopLevelWidget* tlw);
void WindowSetMods(Window* window, int mods);
void WindowSetInternalSize(rack::window::Window* window, math::Vec size);
}
}