@@ -1,18 +1,13 @@ | |||||
#pragma once | #pragma once | ||||
#include <app/common.hpp> | #include <app/common.hpp> | ||||
#include <widget/OpaqueWidget.hpp> | |||||
#include <widget/Widget.hpp> | |||||
namespace rack { | namespace rack { | ||||
namespace app { | namespace app { | ||||
struct MenuBar : widget::OpaqueWidget { | |||||
void draw(const DrawArgs& args) override; | |||||
}; | |||||
MenuBar* createMenuBar(); | |||||
widget::Widget* createMenuBar(); | |||||
} // namespace app | } // namespace app | ||||
@@ -3,7 +3,6 @@ | |||||
#include <widget/OpaqueWidget.hpp> | #include <widget/OpaqueWidget.hpp> | ||||
#include <app/RackScrollWidget.hpp> | #include <app/RackScrollWidget.hpp> | ||||
#include <app/RackWidget.hpp> | #include <app/RackWidget.hpp> | ||||
#include <app/MenuBar.hpp> | |||||
namespace rack { | namespace rack { | ||||
@@ -17,7 +16,7 @@ struct Scene : widget::OpaqueWidget { | |||||
// Convenience variables for accessing important widgets | // Convenience variables for accessing important widgets | ||||
RackScrollWidget* rackScroll; | RackScrollWidget* rackScroll; | ||||
RackWidget* rack; | RackWidget* rack; | ||||
MenuBar* menuBar; | |||||
widget::Widget* menuBar; | |||||
widget::Widget* moduleBrowser; | widget::Widget* moduleBrowser; | ||||
widget::Widget* frameRateWidget; | widget::Widget* frameRateWidget; | ||||
@@ -4,6 +4,7 @@ | |||||
#include <osdialog.h> | #include <osdialog.h> | ||||
#include <app/MenuBar.hpp> | #include <app/MenuBar.hpp> | ||||
#include <widget/OpaqueWidget.hpp> | |||||
#include <window.hpp> | #include <window.hpp> | ||||
#include <engine/Engine.hpp> | #include <engine/Engine.hpp> | ||||
#include <asset.hpp> | #include <asset.hpp> | ||||
@@ -931,15 +932,18 @@ struct HelpButton : MenuButton { | |||||
// MenuBar | // MenuBar | ||||
//////////////////// | //////////////////// | ||||
void MenuBar::draw(const DrawArgs& args) { | |||||
bndMenuBackground(args.vg, 0.0, 0.0, box.size.x, box.size.y, BND_CORNER_ALL); | |||||
bndBevel(args.vg, 0.0, 0.0, box.size.x, box.size.y); | |||||
Widget::draw(args); | |||||
} | |||||
struct MenuBar : widget::OpaqueWidget { | |||||
void draw(const DrawArgs& args) override { | |||||
bndMenuBackground(args.vg, 0.0, 0.0, box.size.x, box.size.y, BND_CORNER_ALL); | |||||
bndBevel(args.vg, 0.0, 0.0, box.size.x, box.size.y); | |||||
Widget::draw(args); | |||||
} | |||||
}; | |||||
MenuBar* createMenuBar() { | |||||
widget::Widget* createMenuBar() { | |||||
MenuBar* menuBar = new MenuBar; | MenuBar* menuBar = new MenuBar; | ||||
const float margin = 5; | const float margin = 5; | ||||
@@ -4,6 +4,7 @@ | |||||
#include <app/Scene.hpp> | #include <app/Scene.hpp> | ||||
#include <app/ModuleBrowser.hpp> | #include <app/ModuleBrowser.hpp> | ||||
#include <app/MenuBar.hpp> | |||||
#include <context.hpp> | #include <context.hpp> | ||||
#include <system.hpp> | #include <system.hpp> | ||||
#include <network.hpp> | #include <network.hpp> | ||||