From e1c629ee5ee3f9a556db0597f6f7452ff2117859 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 24 Jan 2022 23:06:38 +0000 Subject: [PATCH] Fix unmovable Cardinal blank panel Signed-off-by: falkTX --- plugins/Cardinal/plugin.json | 2 +- plugins/Cardinal/src/Blank.cpp | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/plugins/Cardinal/plugin.json b/plugins/Cardinal/plugin.json index 583826f..f31b06d 100644 --- a/plugins/Cardinal/plugin.json +++ b/plugins/Cardinal/plugin.json @@ -80,7 +80,7 @@ "slug": "Blank", "disabled": false, "name": "Blank", - "description": "Cardinal's own blank panel", + "description": "Cardinal's own blank panel, featuring Hatsune Miku", "tags": [ "Visual" ] diff --git a/plugins/Cardinal/src/Blank.cpp b/plugins/Cardinal/src/Blank.cpp index 9d9fa20..1b49cf0 100644 --- a/plugins/Cardinal/src/Blank.cpp +++ b/plugins/Cardinal/src/Blank.cpp @@ -36,7 +36,7 @@ struct CardinalBlankModule : Module { } }; -struct CardinalBlankImage : OpaqueWidget { +struct CardinalBlankImage : Widget { int imageId = -2; int imageWidth = 0; int imageHeight = 0; @@ -47,14 +47,6 @@ struct CardinalBlankImage : OpaqueWidget { this->hasModule = hasModule; } - /* - ~CardinalBlankWidget() - { - if (imageId >= 0) - nvgDeleteImage(args.vg, imageId); - } - */ - void draw(const DrawArgs& args) override { if (imageId == -2) @@ -79,8 +71,6 @@ struct CardinalBlankImage : OpaqueWidget { imgHeight, 0, imageId, 1.0f)); nvgFill(args.vg); } - - OpaqueWidget::draw(args); } };