From 756da05c384e3d9258fc07cf9441d899238503f1 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 3 Jan 2021 11:50:41 +0100 Subject: Add dggui namespace to libdggui components. --- plugin/drumgizmo_plugin.cc | 8 ++++---- plugin/drumgizmo_plugin.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'plugin') diff --git a/plugin/drumgizmo_plugin.cc b/plugin/drumgizmo_plugin.cc index b955eb3..671fab6 100644 --- a/plugin/drumgizmo_plugin.cc +++ b/plugin/drumgizmo_plugin.cc @@ -176,7 +176,7 @@ bool DrumGizmoPlugin::hasInlineGUI() } class InlinePixelBufferAlpha - : public GUI::PixelBufferAlpha + : public dggui::PixelBufferAlpha { public: InlinePixelBufferAlpha(Plugin::InlineDrawContext& context) @@ -190,7 +190,7 @@ public: }; class InlineCanvas - : public GUI::Canvas + : public dggui::Canvas { public: InlineCanvas(Plugin::InlineDrawContext& context) @@ -199,7 +199,7 @@ public: } // From Canvas: - GUI::PixelBufferAlpha& getPixelBuffer() override + dggui::PixelBufferAlpha& getPixelBuffer() override { return pixbuf; } @@ -257,7 +257,7 @@ void DrumGizmoPlugin::onInlineRedraw(std::size_t width, context.data = (unsigned char*)inlineDisplayBuffer; InlineCanvas canvas(context); - GUI::Painter painter(canvas); + dggui::Painter painter(canvas); double progress = (double)settingsGetter.number_of_files_loaded.getValue() / diff --git a/plugin/drumgizmo_plugin.h b/plugin/drumgizmo_plugin.h index 4ecf489..09cdcba 100644 --- a/plugin/drumgizmo_plugin.h +++ b/plugin/drumgizmo_plugin.h @@ -188,23 +188,23 @@ private: ConfigStringIO config_string_io; SettingsGetter settingsGetter{settings}; - GUI::ImageCache imageCache; - GUI::TexturedBox box{imageCache, ":resources/progress.png", + dggui::ImageCache imageCache; + dggui::TexturedBox box{imageCache, ":resources/progress.png", 0, 0, // atlas offset (x, y) 6, 1, 6, // dx1, dx2, dx3 11, 0, 0}; // dy1, dy2, dy3 - GUI::TexturedBox bar_red{imageCache, ":resources/progress.png", + dggui::TexturedBox bar_red{imageCache, ":resources/progress.png", 13, 0, // atlas offset (x, y) 2, 1, 2, // dx1, dx2, dx3 11, 0, 0}; // dy1, dy2, dy3 - GUI::TexturedBox bar_green{imageCache, ":resources/progress.png", + dggui::TexturedBox bar_green{imageCache, ":resources/progress.png", 18, 0, // atlas offset (x, y) 2, 1, 2, // dx1, dx2, dx3 11, 0, 0}; // dy1, dy2, dy3 - GUI::TexturedBox bar_blue{imageCache, ":resources/progress.png", + dggui::TexturedBox bar_blue{imageCache, ":resources/progress.png", 23, 0, // atlas offset (x, y) 2, 1, 2, // dx1, dx2, dx3 11, 0, 0}; // dy1, dy2, dy3 @@ -213,10 +213,10 @@ private: std::shared_ptr drumgizmo; std::uint32_t inlineDisplayBuffer[1024*1024]; - GUI::Image inline_display_image{":resources/logo.png"}; + dggui::Image inline_display_image{":resources/logo.png"}; bool inline_image_first_draw{true}; #ifdef WITH_NLS - UITranslation translation; + dggui::UITranslation translation; #endif // WITH_NLS }; -- cgit v1.2.3