From df89de7847f4c629fb3ef7b2f189fb050fd48794 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sat, 25 Sep 2021 09:19:35 -0400 Subject: [PATCH] Move Svg to window:: namespace. --- adapters/standalone.cpp | 2 +- include/Quantity.hpp | 5 +++-- include/app/ModuleWidget.hpp | 2 +- include/app/SvgButton.hpp | 4 ++-- include/app/SvgKnob.hpp | 4 ++-- include/app/SvgPanel.hpp | 4 ++-- include/app/SvgPort.hpp | 4 ++-- include/app/SvgScrew.hpp | 2 +- include/app/SvgSlider.hpp | 10 +++++----- include/app/SvgSwitch.hpp | 4 ++-- include/app/common.hpp | 2 +- include/componentlibrary.hpp | 3 +++ include/helpers.hpp | 3 +-- include/patch.hpp | 1 + include/rack.hpp | 2 +- include/weakptr.hpp | 2 +- include/widget/SvgWidget.hpp | 7 +++---- include/widget/Widget.hpp | 2 +- include/{svg.hpp => window/Svg.hpp} | 2 ++ include/{window.hpp => window/Window.hpp} | 16 ++++++++-------- src/app/CableWidget.cpp | 4 ++-- src/app/LedDisplay.cpp | 4 ++-- src/app/MenuBar.cpp | 2 +- src/app/ModuleWidget.cpp | 2 +- src/app/PortWidget.cpp | 2 +- src/app/RackScrollWidget.cpp | 2 +- src/app/RailWidget.cpp | 3 +-- src/app/SvgButton.cpp | 2 +- src/app/SvgKnob.cpp | 2 +- src/app/SvgPanel.cpp | 2 +- src/app/SvgPort.cpp | 2 +- src/app/SvgScrew.cpp | 2 +- src/app/SvgSlider.cpp | 4 ++-- src/app/SvgSwitch.cpp | 2 +- src/context.cpp | 2 +- src/gamepad.cpp | 2 +- src/keyboard.cpp | 2 +- src/library.cpp | 2 +- src/settings.cpp | 2 +- src/ui/Scrollbar.cpp | 2 +- src/widget/SvgWidget.cpp | 4 ++-- src/widget/event.cpp | 2 +- src/{svg.cpp => window/Svg.cpp} | 4 +++- src/{window.cpp => window/Window.cpp} | 2 +- 44 files changed, 73 insertions(+), 67 deletions(-) rename include/{svg.hpp => window/Svg.hpp} (96%) rename include/{window.hpp => window/Window.hpp} (94%) rename src/{svg.cpp => window/Svg.cpp} (99%) rename src/{window.cpp => window/Window.cpp} (99%) diff --git a/adapters/standalone.cpp b/adapters/standalone.cpp index 1cca2087..fff268b5 100644 --- a/adapters/standalone.cpp +++ b/adapters/standalone.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/Quantity.hpp b/include/Quantity.hpp index c64624af..907f53e9 100644 --- a/include/Quantity.hpp +++ b/include/Quantity.hpp @@ -7,8 +7,9 @@ namespace rack { -/** A controller for manipulating a float value (which subclasses must store somehow) with limits and labels -Often used as a decorator component for widget::Widgets that read or write a quantity. +/** A controller for manipulating a float value (which subclasses must store somehow) with limits and labels. + +Often used as a decorator component for `widget::Widget`s that read or write a quantity. */ struct Quantity { virtual ~Quantity() {} diff --git a/include/app/ModuleWidget.hpp b/include/app/ModuleWidget.hpp index 50fd0e74..f1071016 100644 --- a/include/app/ModuleWidget.hpp +++ b/include/app/ModuleWidget.hpp @@ -42,7 +42,7 @@ struct ModuleWidget : widget::OpaqueWidget { Transfers ownership. */ void setPanel(widget::Widget* panel); - void setPanel(std::shared_ptr svg); + void setPanel(std::shared_ptr svg); /** Convenience functions for adding special widgets. Just calls addChild() with additional checking. diff --git a/include/app/SvgButton.hpp b/include/app/SvgButton.hpp index 122ce36d..c87751b6 100644 --- a/include/app/SvgButton.hpp +++ b/include/app/SvgButton.hpp @@ -14,10 +14,10 @@ struct SvgButton : widget::OpaqueWidget { widget::FramebufferWidget* fb; CircularShadow* shadow; widget::SvgWidget* sw; - std::vector> frames; + std::vector> frames; SvgButton(); - void addFrame(std::shared_ptr svg); + void addFrame(std::shared_ptr svg); void onButton(const ButtonEvent& e) override; void onDragStart(const DragStartEvent& e) override; void onDragEnd(const DragEndEvent& e) override; diff --git a/include/app/SvgKnob.hpp b/include/app/SvgKnob.hpp index ebb4e0f1..2595910d 100644 --- a/include/app/SvgKnob.hpp +++ b/include/app/SvgKnob.hpp @@ -19,8 +19,8 @@ struct SvgKnob : Knob { widget::SvgWidget* sw; SvgKnob(); - void setSvg(std::shared_ptr svg); - DEPRECATED void setSVG(std::shared_ptr svg) { + void setSvg(std::shared_ptr svg); + DEPRECATED void setSVG(std::shared_ptr svg) { setSvg(svg); } void onChange(const ChangeEvent& e) override; diff --git a/include/app/SvgPanel.hpp b/include/app/SvgPanel.hpp index 1c6a2c50..742dd19a 100644 --- a/include/app/SvgPanel.hpp +++ b/include/app/SvgPanel.hpp @@ -19,11 +19,11 @@ struct SvgPanel : widget::Widget { widget::FramebufferWidget* fb; widget::SvgWidget* sw; PanelBorder* panelBorder; - std::shared_ptr svg; + std::shared_ptr svg; SvgPanel(); void step() override; - void setBackground(std::shared_ptr svg); + void setBackground(std::shared_ptr svg); }; diff --git a/include/app/SvgPort.hpp b/include/app/SvgPort.hpp index c52ee485..12643986 100644 --- a/include/app/SvgPort.hpp +++ b/include/app/SvgPort.hpp @@ -16,8 +16,8 @@ struct SvgPort : PortWidget { widget::SvgWidget* sw; SvgPort(); - void setSvg(std::shared_ptr svg); - DEPRECATED void setSVG(std::shared_ptr svg) { + void setSvg(std::shared_ptr svg); + DEPRECATED void setSVG(std::shared_ptr svg) { setSvg(svg); } }; diff --git a/include/app/SvgScrew.hpp b/include/app/SvgScrew.hpp index 7e8d886b..2e85690f 100644 --- a/include/app/SvgScrew.hpp +++ b/include/app/SvgScrew.hpp @@ -15,7 +15,7 @@ struct SvgScrew : widget::Widget { widget::SvgWidget* sw; SvgScrew(); - void setSvg(std::shared_ptr svg); + void setSvg(std::shared_ptr svg); }; diff --git a/include/app/SvgSlider.hpp b/include/app/SvgSlider.hpp index 605c8357..ef3f92a6 100644 --- a/include/app/SvgSlider.hpp +++ b/include/app/SvgSlider.hpp @@ -20,19 +20,19 @@ struct SvgSlider : app::SliderKnob { math::Vec minHandlePos, maxHandlePos; SvgSlider(); - void setBackgroundSvg(std::shared_ptr svg); - void setHandleSvg(std::shared_ptr svg); + void setBackgroundSvg(std::shared_ptr svg); + void setHandleSvg(std::shared_ptr svg); void setHandlePos(math::Vec minHandlePos, math::Vec maxHandlePos); void setHandlePosCentered(math::Vec minHandlePosCentered, math::Vec maxHandlePosCentered); void onChange(const ChangeEvent& e) override; - DEPRECATED void setBackgroundSVG(std::shared_ptr svg) { + DEPRECATED void setBackgroundSVG(std::shared_ptr svg) { setBackgroundSvg(svg); } - DEPRECATED void setHandleSVG(std::shared_ptr svg) { + DEPRECATED void setHandleSVG(std::shared_ptr svg) { setBackgroundSvg(svg); } - DEPRECATED void setSVGs(std::shared_ptr backgroundSvg, std::shared_ptr handleSvg) { + DEPRECATED void setSVGs(std::shared_ptr backgroundSvg, std::shared_ptr handleSvg) { setBackgroundSvg(backgroundSvg); setHandleSvg(handleSvg); } diff --git a/include/app/SvgSwitch.hpp b/include/app/SvgSwitch.hpp index 98efc8f7..5d4d987f 100644 --- a/include/app/SvgSwitch.hpp +++ b/include/app/SvgSwitch.hpp @@ -15,11 +15,11 @@ struct SvgSwitch : Switch { widget::FramebufferWidget* fb; CircularShadow* shadow; widget::SvgWidget* sw; - std::vector> frames; + std::vector> frames; SvgSwitch(); /** Adds an SVG file to represent the next switch position */ - void addFrame(std::shared_ptr svg); + void addFrame(std::shared_ptr svg); void onChange(const ChangeEvent& e) override; }; diff --git a/include/app/common.hpp b/include/app/common.hpp index e4481bbb..df20dc27 100644 --- a/include/app/common.hpp +++ b/include/app/common.hpp @@ -2,8 +2,8 @@ #include #include +#include #include -#include // for mm2px(), etc namespace rack { diff --git a/include/componentlibrary.hpp b/include/componentlibrary.hpp index 0d4a5d46..23dc3e56 100644 --- a/include/componentlibrary.hpp +++ b/include/componentlibrary.hpp @@ -21,6 +21,9 @@ See LICENSE.md for legal details about using Rack component graphics in your Rac namespace componentlibrary { +using namespace window; + + //////////////////// // Color scheme //////////////////// diff --git a/include/helpers.hpp b/include/helpers.hpp index f084ef56..03c7c56d 100644 --- a/include/helpers.hpp +++ b/include/helpers.hpp @@ -66,8 +66,7 @@ TWidget* createWidgetCentered(math::Vec pos) { inline app::SvgPanel* createPanel(std::string svgPath) { app::SvgPanel* panel = new app::SvgPanel; - std::shared_ptr svg = Svg::load(svgPath); - panel->setBackground(svg); + panel->setBackground(window::Svg::load(svgPath)); return panel; } diff --git a/include/patch.hpp b/include/patch.hpp index c081a0b5..23e0dbfb 100644 --- a/include/patch.hpp +++ b/include/patch.hpp @@ -8,6 +8,7 @@ namespace rack { namespace patch { +/** Handles the Rack patch file state. */ struct Manager { struct Internal; Internal* internal; diff --git a/include/rack.hpp b/include/rack.hpp index eb1b7b86..46d87626 100644 --- a/include/rack.hpp +++ b/include/rack.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/weakptr.hpp b/include/weakptr.hpp index 7eb328de..a3e6ca9a 100644 --- a/include/weakptr.hpp +++ b/include/weakptr.hpp @@ -12,7 +12,7 @@ struct WeakHandle { }; -/** Base class for classes that allow WeakPtrs to be used. +/** Base class for classes that allow `WeakPtr`s to be used. */ struct WeakBase { WeakHandle* weakHandle = nullptr; diff --git a/include/widget/SvgWidget.hpp b/include/widget/SvgWidget.hpp index 356dca5d..5136c756 100644 --- a/include/widget/SvgWidget.hpp +++ b/include/widget/SvgWidget.hpp @@ -1,6 +1,5 @@ #pragma once #include -#include namespace rack { @@ -9,14 +8,14 @@ namespace widget { /** Draws an Svg */ struct SvgWidget : Widget { - std::shared_ptr svg; + std::shared_ptr svg; /** Sets the box size to the SVG image size */ void wrap(); /** Sets and wraps the SVG */ - void setSvg(std::shared_ptr svg); - DEPRECATED void setSVG(std::shared_ptr svg) { + void setSvg(std::shared_ptr svg); + DEPRECATED void setSVG(std::shared_ptr svg) { setSvg(svg); } diff --git a/include/widget/Widget.hpp b/include/widget/Widget.hpp index 61237b12..fdf7f781 100644 --- a/include/widget/Widget.hpp +++ b/include/widget/Widget.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/svg.hpp b/include/window/Svg.hpp similarity index 96% rename from include/svg.hpp rename to include/window/Svg.hpp index c9a12294..b57bd84e 100644 --- a/include/svg.hpp +++ b/include/window/Svg.hpp @@ -9,6 +9,7 @@ namespace rack { +namespace window { /** Arbitrary DPI, standardized for Rack. */ @@ -60,4 +61,5 @@ DEPRECATED typedef Svg SVG; void svgDraw(NVGcontext* vg, NSVGimage* svg); +} // namespace window } // namespace rack diff --git a/include/window.hpp b/include/window/Window.hpp similarity index 94% rename from include/window.hpp rename to include/window/Window.hpp index 927dab08..36861762 100644 --- a/include/window.hpp +++ b/include/window/Window.hpp @@ -3,6 +3,10 @@ #include #include +#include +#include +#include + #define GLEW_STATIC #define GLEW_NO_GLU #include @@ -11,14 +15,11 @@ #define NANOVG_GL2 #include #include -#include -#include - -#include -#include namespace rack { +/** Handles OS windowing, OpenGL, and NanoVG +*/ namespace window { @@ -48,6 +49,7 @@ struct Image { }; +/** OS window with OpenGL context. */ struct Window { struct Internal; Internal* internal; @@ -93,9 +95,7 @@ struct Window { std::shared_ptr loadFont(const std::string& filename); std::shared_ptr loadImage(const std::string& filename); - - /** Use `Svg::load(filename)` in new code. */ - DEPRECATED std::shared_ptr loadSvg(const std::string& filename) { + std::shared_ptr loadSvg(const std::string& filename) { return Svg::load(filename); } diff --git a/src/app/CableWidget.cpp b/src/app/CableWidget.cpp index a5a58447..c6fba0c2 100644 --- a/src/app/CableWidget.cpp +++ b/src/app/CableWidget.cpp @@ -57,14 +57,14 @@ struct PlugWidget : widget::Widget { plugTransform->addChild(plugTint); plug = new widget::SvgWidget; - plug->setSvg(Svg::load(asset::system("res/ComponentLibrary/Plug.svg"))); + plug->setSvg(window::Svg::load(asset::system("res/ComponentLibrary/Plug.svg"))); plugTint->addChild(plug); plugTransform->setSize(plug->getSize()); plugTransform->setPosition(plug->getSize().mult(-0.5)); plugTint->setSize(plug->getSize()); plugPort = new widget::SvgWidget; - plugPort->setSvg(Svg::load(asset::system("res/ComponentLibrary/PlugPort.svg"))); + plugPort->setSvg(window::Svg::load(asset::system("res/ComponentLibrary/PlugPort.svg"))); plugPort->setPosition(plugPort->getSize().mult(-0.5)); fb->addChild(plugPort); diff --git a/src/app/LedDisplay.cpp b/src/app/LedDisplay.cpp index d0a98ca8..acce2885 100644 --- a/src/app/LedDisplay.cpp +++ b/src/app/LedDisplay.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include @@ -36,7 +36,7 @@ void LedDisplaySeparator::draw(const DrawArgs& args) { LedDisplayChoice::LedDisplayChoice() { - box.size = mm2px(math::Vec(0, 28.0 / 3)); + box.size = window::mm2px(math::Vec(0, 28.0 / 3)); fontPath = asset::system("res/fonts/ShareTechMono-Regular.ttf"); textOffset = math::Vec(10, 18); color = nvgRGB(0xff, 0xd7, 0x14); diff --git a/src/app/MenuBar.cpp b/src/app/MenuBar.cpp index f5ff4466..7b18b3fa 100644 --- a/src/app/MenuBar.cpp +++ b/src/app/MenuBar.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp index e9223269..2096ca48 100644 --- a/src/app/ModuleWidget.cpp +++ b/src/app/ModuleWidget.cpp @@ -98,7 +98,7 @@ void ModuleWidget::setPanel(widget::Widget* panel) { } } -void ModuleWidget::setPanel(std::shared_ptr svg) { +void ModuleWidget::setPanel(std::shared_ptr svg) { // Create SvgPanel SvgPanel* panel = new SvgPanel; panel->setBackground(svg); diff --git a/src/app/PortWidget.cpp b/src/app/PortWidget.cpp index b978ba88..1d7844a0 100644 --- a/src/app/PortWidget.cpp +++ b/src/app/PortWidget.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/src/app/RackScrollWidget.cpp b/src/app/RackScrollWidget.cpp index 6145c597..2f2aaecd 100644 --- a/src/app/RackScrollWidget.cpp +++ b/src/app/RackScrollWidget.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/src/app/RailWidget.cpp b/src/app/RailWidget.cpp index 2c3a146a..93816cf1 100644 --- a/src/app/RailWidget.cpp +++ b/src/app/RailWidget.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include @@ -27,7 +26,7 @@ RailWidget::RailWidget() { addChild(internal->railFb); internal->railSw = new widget::SvgWidget; - internal->railSw->setSvg(Svg::load(asset::system("res/ComponentLibrary/Rail.svg"))); + internal->railSw->setSvg(window::Svg::load(asset::system("res/ComponentLibrary/Rail.svg"))); internal->railFb->addChild(internal->railSw); } diff --git a/src/app/SvgButton.cpp b/src/app/SvgButton.cpp index d14e0edc..bd4cc8a6 100644 --- a/src/app/SvgButton.cpp +++ b/src/app/SvgButton.cpp @@ -30,7 +30,7 @@ void SvgButton::onButton(const ButtonEvent& e) { } -void SvgButton::addFrame(std::shared_ptr svg) { +void SvgButton::addFrame(std::shared_ptr svg) { frames.push_back(svg); // If this is our first frame, automatically set SVG and size if (!sw->svg) { diff --git a/src/app/SvgKnob.cpp b/src/app/SvgKnob.cpp index 72a7073e..4eeee93b 100644 --- a/src/app/SvgKnob.cpp +++ b/src/app/SvgKnob.cpp @@ -20,7 +20,7 @@ SvgKnob::SvgKnob() { tw->addChild(sw); } -void SvgKnob::setSvg(std::shared_ptr svg) { +void SvgKnob::setSvg(std::shared_ptr svg) { sw->setSvg(svg); tw->box.size = sw->box.size; fb->box.size = sw->box.size; diff --git a/src/app/SvgPanel.cpp b/src/app/SvgPanel.cpp index ef27b16c..66af5a63 100644 --- a/src/app/SvgPanel.cpp +++ b/src/app/SvgPanel.cpp @@ -37,7 +37,7 @@ void SvgPanel::step() { Widget::step(); } -void SvgPanel::setBackground(std::shared_ptr svg) { +void SvgPanel::setBackground(std::shared_ptr svg) { this->svg = svg; sw->setSvg(svg); diff --git a/src/app/SvgPort.cpp b/src/app/SvgPort.cpp index 753b662a..13722351 100644 --- a/src/app/SvgPort.cpp +++ b/src/app/SvgPort.cpp @@ -19,7 +19,7 @@ SvgPort::SvgPort() { fb->addChild(sw); } -void SvgPort::setSvg(std::shared_ptr svg) { +void SvgPort::setSvg(std::shared_ptr svg) { sw->setSvg(svg); fb->box.size = sw->box.size; box.size = sw->box.size; diff --git a/src/app/SvgScrew.cpp b/src/app/SvgScrew.cpp index adbb33a5..0401c8b2 100644 --- a/src/app/SvgScrew.cpp +++ b/src/app/SvgScrew.cpp @@ -14,7 +14,7 @@ SvgScrew::SvgScrew() { } -void SvgScrew::setSvg(std::shared_ptr svg) { +void SvgScrew::setSvg(std::shared_ptr svg) { sw->setSvg(svg); fb->box.size = sw->box.size; box.size = sw->box.size; diff --git a/src/app/SvgSlider.cpp b/src/app/SvgSlider.cpp index 6ff1d0e0..ec17caae 100644 --- a/src/app/SvgSlider.cpp +++ b/src/app/SvgSlider.cpp @@ -19,7 +19,7 @@ SvgSlider::SvgSlider() { } -void SvgSlider::setBackgroundSvg(std::shared_ptr svg) { +void SvgSlider::setBackgroundSvg(std::shared_ptr svg) { background->setSvg(svg); box.size = background->box.size; fb->box.size = background->box.size; @@ -27,7 +27,7 @@ void SvgSlider::setBackgroundSvg(std::shared_ptr svg) { } -void SvgSlider::setHandleSvg(std::shared_ptr svg) { +void SvgSlider::setHandleSvg(std::shared_ptr svg) { handle->setSvg(svg); handle->box.pos = minHandlePos; fb->setDirty(); diff --git a/src/app/SvgSwitch.cpp b/src/app/SvgSwitch.cpp index c1d5c0e4..7c98a0da 100644 --- a/src/app/SvgSwitch.cpp +++ b/src/app/SvgSwitch.cpp @@ -17,7 +17,7 @@ SvgSwitch::SvgSwitch() { fb->addChild(sw); } -void SvgSwitch::addFrame(std::shared_ptr svg) { +void SvgSwitch::addFrame(std::shared_ptr svg) { frames.push_back(svg); // If this is our first frame, automatically set SVG and size if (!sw->svg) { diff --git a/src/context.cpp b/src/context.cpp index beaeceab..c0ef6d47 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/src/gamepad.cpp b/src/gamepad.cpp index deff9224..06fecf45 100644 --- a/src/gamepad.cpp +++ b/src/gamepad.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace rack { diff --git a/src/keyboard.cpp b/src/keyboard.cpp index 3e731f87..d11ca222 100644 --- a/src/keyboard.cpp +++ b/src/keyboard.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include namespace rack { diff --git a/src/library.cpp b/src/library.cpp index 89ca002a..7b92f366 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/settings.cpp b/src/settings.cpp index 47ee9dc8..0997e155 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ui/Scrollbar.cpp b/src/ui/Scrollbar.cpp index 0e6f6ea9..faa6ad92 100644 --- a/src/ui/Scrollbar.cpp +++ b/src/ui/Scrollbar.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace rack { diff --git a/src/widget/SvgWidget.cpp b/src/widget/SvgWidget.cpp index 93650ad8..552a5d0d 100644 --- a/src/widget/SvgWidget.cpp +++ b/src/widget/SvgWidget.cpp @@ -15,7 +15,7 @@ void SvgWidget::wrap() { } } -void SvgWidget::setSvg(std::shared_ptr svg) { +void SvgWidget::setSvg(std::shared_ptr svg) { this->svg = svg; wrap(); } @@ -24,7 +24,7 @@ void SvgWidget::draw(const DrawArgs& args) { if (!svg) return; - svgDraw(args.vg, svg->handle); + window::svgDraw(args.vg, svg->handle); } diff --git a/src/widget/event.cpp b/src/widget/event.cpp index 7cb87909..7958cfe4 100644 --- a/src/widget/event.cpp +++ b/src/widget/event.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/src/svg.cpp b/src/window/Svg.cpp similarity index 99% rename from src/svg.cpp rename to src/window/Svg.cpp index 79504460..50bdc66d 100644 --- a/src/svg.cpp +++ b/src/window/Svg.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -9,6 +9,7 @@ namespace rack { +namespace window { Svg::~Svg() { @@ -301,4 +302,5 @@ void svgDraw(NVGcontext* vg, NSVGimage* svg) { } +} // namespace window } // namespace rack diff --git a/src/window.cpp b/src/window/Window.cpp similarity index 99% rename from src/window.cpp rename to src/window/Window.cpp index fed8429f..14503ffe 100644 --- a/src/window.cpp +++ b/src/window/Window.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include