From c0da82ab92893be56e74f81175f7ef5835132ceb Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 20 Nov 2022 21:38:55 +0100 Subject: [PATCH] Also removed PaintSelectionBox. --- modules/paint/SCsub | 1 - modules/paint/register_types.cpp | 2 - modules/paint/ui/paint_selection_box.cpp | 64 ------------------------ modules/paint/ui/paint_selection_box.h | 48 ------------------ 4 files changed, 115 deletions(-) delete mode 100644 modules/paint/ui/paint_selection_box.cpp delete mode 100644 modules/paint/ui/paint_selection_box.h diff --git a/modules/paint/SCsub b/modules/paint/SCsub index da8515eb7..f42bf8d84 100644 --- a/modules/paint/SCsub +++ b/modules/paint/SCsub @@ -20,7 +20,6 @@ module_env.add_source_files(env.modules_sources,"actions/rainbow_action.cpp") module_env.add_source_files(env.modules_sources,"actions/rect_action.cpp") module_env.add_source_files(env.modules_sources,"ui/paint_canvas_background.cpp") -module_env.add_source_files(env.modules_sources,"ui/paint_selection_box.cpp") module_env.add_source_files(env.modules_sources,"ui/paint_visual_grid.cpp") module_env.add_source_files(env.modules_sources,"ui/property_inspectors/paint_custom_property_inspector.cpp") diff --git a/modules/paint/register_types.cpp b/modules/paint/register_types.cpp index cf22ede43..b83fdd45a 100644 --- a/modules/paint/register_types.cpp +++ b/modules/paint/register_types.cpp @@ -37,7 +37,6 @@ SOFTWARE. #include "actions/rect_action.h" #include "ui/paint_canvas_background.h" -#include "ui/paint_selection_box.h" #include "ui/paint_visual_grid.h" #include "ui/property_inspectors/paint_custom_property_inspector.h" @@ -69,7 +68,6 @@ void register_paint_types() { ClassDB::register_class(); ClassDB::register_class(); - ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); diff --git a/modules/paint/ui/paint_selection_box.cpp b/modules/paint/ui/paint_selection_box.cpp deleted file mode 100644 index 451167744..000000000 --- a/modules/paint/ui/paint_selection_box.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* -Copyright (c) 2019 Flairieve -Copyright (c) 2020-2022 cobrapitz -Copyright (c) 2022 Péter Magyar - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "paint_selection_box.h" - -void PaintSelectionBox::_process(float delta) { - /* - update() - */ -} -void PaintSelectionBox::_draw() { - if (get_size() != Vector2()) { - draw_outline_box(get_size(), Color(0.75, 0.75, 0.75), outline_size); - } -} -void PaintSelectionBox::draw_outline_box(const Vector2 &size, const Color &color, const int width) { - //Top line - draw_line(Vector2(0 + 1, 0), Vector2(size.x, 0), color, width); - //Left line - draw_line(Vector2(0 + 1, 0), Vector2(0, size.y), color, width); - //Bottom line - draw_line(Vector2(0 + 1, size.y), Vector2(size.x, size.y), color, width); - //Right line - draw_line(Vector2(size.x, 0), Vector2(size.x, size.y), color, width); -} - -PaintSelectionBox::PaintSelectionBox() { - outline_size = 3; -} - -PaintSelectionBox::~PaintSelectionBox() { -} - -void PaintSelectionBox::_notification(int p_what) { - switch (p_what) { - case NOTIFICATION_DRAW: { - _draw(); - } break; - } -} - -void PaintSelectionBox::_bind_methods() { -} diff --git a/modules/paint/ui/paint_selection_box.h b/modules/paint/ui/paint_selection_box.h deleted file mode 100644 index 7080dcd7d..000000000 --- a/modules/paint/ui/paint_selection_box.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef PAINT_SELECTION_BOX_H -#define PAINT_SELECTION_BOX_H - -/* -Copyright (c) 2019 Flairieve -Copyright (c) 2020-2022 cobrapitz -Copyright (c) 2022 Péter Magyar - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "scene/gui/control.h" - -class PaintSelectionBox : public Control { - GDCLASS(PaintSelectionBox, Control); - -public: - void _process(float delta); - void _draw(); - void draw_outline_box(const Vector2 &size, const Color &color, const int width); - - PaintSelectionBox(); - ~PaintSelectionBox(); - - int outline_size; - -protected: - void _notification(int p_what); - static void _bind_methods(); -}; - -#endif