Skip to content

Commit

Permalink
Fix issue #2 GUI won't load, and issue #3 GUI breaks when above a cer…
Browse files Browse the repository at this point in the history 
…tain size, update dpf
  • Loading branch information
@brummer10
brummer10 committed Oct 7, 2023
1 parent 8476dbb commit 841fa4d
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 36 deletions.
8 changes: 1 addition & 7 deletions Makefile
View file
Expand Up @@ -83,11 +83,7 @@ all: libs plugins gen
submodules:
git submodule update --init --recursive

pugl_patch.flag:
cd dpf/dgl/src/pugl-upstream/ && git apply ../../../../pugl.patch
touch pugl_patch.flag

libs: pugl_patch.flag
libs:
$(MAKE) -C dpf/dgl ../build/libdgl-cairo.a

plugins: libs
Expand Down Expand Up @@ -123,8 +119,6 @@ clean:
$(MAKE) clean -C plugins/TubeScreamer
$(MAKE) clean -C plugins/ValveCaster
$(MAKE) clean -C plugins/BoobTube
cd dpf/dgl/src/pugl-upstream/ && git apply -R ../../../../pugl.patch
rm -f pugl_patch.flag
rm -rf bin build

install: all
Expand Down
2 changes: 1 addition & 1 deletion dpf
Submodule dpf updated 31 files
+1 −0 Makefile.base.mk
+1 −1 Makefile.plugins.mk
+1 −1 cmake/DPF-plugin.cmake
+90 −53 dgl/Base.hpp
+5 −5 dgl/src/ApplicationPrivateData.cpp
+2 −6 dgl/src/Cairo.cpp
+10 −30 dgl/src/OpenGL.cpp
+2 −2 dgl/src/TopLevelWidgetPrivateData.cpp
+1 −1 dgl/src/TopLevelWidgetPrivateData.hpp
+13 −6 dgl/src/Window.cpp
+95 −62 dgl/src/WindowPrivateData.cpp
+59 −51 dgl/src/pugl-extra/wasm.c
+2 −0 dgl/src/pugl-extra/wasm.h
+1 −1 dgl/src/pugl-upstream
+47 −97 dgl/src/pugl.cpp
+23 −9 dgl/src/pugl.hpp
+1 −1 distrho/DistrhoPlugin.hpp
+4 −4 distrho/src/DistrhoPluginVST.hpp
+12 −8 distrho/src/DistrhoPluginVST2.cpp
+5 −3 distrho/src/DistrhoPluginVST3.cpp
+2 −2 distrho/src/DistrhoUI.cpp
+1 −2 examples/CairoUI/CMakeLists.txt
+113 −22 examples/CairoUI/CairoExamplePlugin.cpp
+66 −24 examples/CairoUI/CairoExampleUI.cpp
+0 −99 examples/CairoUI/DemoWidgetBanner.cpp
+73 −6 examples/CairoUI/DemoWidgetBanner.hpp
+51 −21 examples/CairoUI/DemoWidgetClickable.hpp
+30 −4 examples/CairoUI/DistrhoPluginInfo.h
+1 −6 examples/CairoUI/Makefile
+1 −1 examples/Info/ResizeHandle.hpp
+3 −3 examples/Meters/ExamplePluginMeters.cpp
3 changes: 1 addition & 2 deletions plugins/BoobTube/UIBoobTube.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UIBoobTube::UIBoobTube()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand Down Expand Up @@ -51,7 +51,6 @@ UIBoobTube::UIBoobTube()
dynamic_cast<UI*>(this), "BoobTube ", PluginBoobTube::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
3 changes: 1 addition & 2 deletions plugins/CollisionDrive/UICollisionDrive.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UICollisionDrive::UICollisionDrive()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand Down Expand Up @@ -57,7 +57,6 @@ UICollisionDrive::UICollisionDrive()
dynamic_cast<UI*>(this), "CollisionDrive", PluginCollisionDrive::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
3 changes: 1 addition & 2 deletions plugins/MetalTone/UIMetalTone.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UIMetalTone::UIMetalTone()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand Down Expand Up @@ -59,7 +59,6 @@ UIMetalTone::UIMetalTone()
dynamic_cast<UI*>(this), "MetalTone", PluginMetalTone::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
3 changes: 1 addition & 2 deletions plugins/NewPedal/UINewPedal.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UINewPedal::UINewPedal()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand All @@ -28,7 +28,6 @@ UINewPedal::UINewPedal()
dynamic_cast<UI*>(this), "NewPedal", PluginNewPedal::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
3 changes: 1 addition & 2 deletions plugins/Rumor/UIRumor.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UIRumor::UIRumor()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand All @@ -39,7 +39,6 @@ UIRumor::UIRumor()
dynamic_cast<UI*>(this), "Rumor ", PluginRumor::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
3 changes: 1 addition & 2 deletions plugins/TubeScreamer/UITubeScreamer.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UITubeScreamer::UITubeScreamer()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand Down Expand Up @@ -46,7 +46,6 @@ UITubeScreamer::UITubeScreamer()
dynamic_cast<UI*>(this), "TubeScreamer", PluginTubeScreamer::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/Utils/ResizeHandle.hpp
View file
Expand Up @@ -179,7 +179,7 @@ class ResizeHandle : public TopLevelWidget
return;

hasCursor = shouldHaveCursor;
setCursor(shouldHaveCursor ? kMouseCursorDiagonal : kMouseCursorArrow);
setCursor(shouldHaveCursor ? kMouseCursorUpLeftDownRight : kMouseCursorArrow);
}

void resetArea()
Expand Down
3 changes: 1 addition & 2 deletions plugins/ValveCaster/UIValveCaster.cpp
View file
Expand Up @@ -15,7 +15,7 @@ START_NAMESPACE_DISTRHO
// Init / Deinit

UIValveCaster::UIValveCaster()
: UI(285, 400), theme(), fResizeHandle(this) {
: UI(285, 400, true), theme(), fResizeHandle(this) {
kInitialHeight = 400;
kInitialWidth = 285;
blocked = false;
Expand Down Expand Up @@ -51,7 +51,6 @@ UIValveCaster::UIValveCaster()
dynamic_cast<UI*>(this), "ValveCaster", PluginValveCaster::dpf_bypass);
sizeGroup->addToSizeGroup(bypassSwitch, 30, 220, 225, 150);

setGeometryConstraints(143, 200);
if (isResizable()) fResizeHandle.hide();
}

Expand Down
13 changes: 0 additions & 13 deletions pugl.patch
View file

This file was deleted.

0 comments on commit 841fa4d

Please sign in to comment.