summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/color_picker.h2
-rw-r--r--scene/gui/color_rect.cpp31
-rw-r--r--scene/gui/color_rect.h34
-rw-r--r--scene/gui/graph_edit.h2
-rw-r--r--scene/gui/patch_9_rect.cpp (renamed from scene/gui/patch_9_frame.cpp)4
-rw-r--r--scene/gui/patch_9_rect.h (renamed from scene/gui/patch_9_frame.h)2
-rw-r--r--scene/gui/reference_rect.cpp (renamed from scene/gui/reference_frame.cpp)8
-rw-r--r--scene/gui/reference_rect.h (renamed from scene/gui/reference_frame.h)14
-rw-r--r--scene/gui/texture_rect.cpp (renamed from scene/gui/texture_frame.cpp)4
-rw-r--r--scene/gui/texture_rect.h (renamed from scene/gui/texture_frame.h)2
-rw-r--r--scene/register_scene_types.cpp8
-rw-r--r--scene/resources/default_theme/default_theme.cpp4
12 files changed, 84 insertions, 31 deletions
diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h
index bb8a4a8dbd..b6f9e9a070 100644
--- a/scene/gui/color_picker.h
+++ b/scene/gui/color_picker.h
@@ -36,7 +36,7 @@
#include "scene/gui/button.h"
#include "scene/gui/popup.h"
#include "scene/gui/box_container.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
#include "scene/gui/tool_button.h"
#include "scene/gui/check_button.h"
diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp
index ce12a27460..99797aa9c1 100644
--- a/scene/gui/color_rect.cpp
+++ b/scene/gui/color_rect.cpp
@@ -1,8 +1,34 @@
+/*************************************************************************/
+/* color_rect.cpp */
+/*************************************************************************/
+/* This file is part of: */
+/* GODOT ENGINE */
+/* http://www.godotengine.org */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
+/* */
+/* 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 "color_rect.h"
-
-
void ColorRect::set_frame_color(const Color& p_color) {
color=p_color;
@@ -33,4 +59,3 @@ ColorRect::ColorRect() {
color=Color(1,1,1);
}
-
diff --git a/scene/gui/color_rect.h b/scene/gui/color_rect.h
index 9d8b958130..55e413ce27 100644
--- a/scene/gui/color_rect.h
+++ b/scene/gui/color_rect.h
@@ -1,5 +1,33 @@
-#ifndef COLORRECT_H
-#define COLORRECT_H
+/*************************************************************************/
+/* color_rect.h */
+/*************************************************************************/
+/* This file is part of: */
+/* GODOT ENGINE */
+/* http://www.godotengine.org */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
+/* */
+/* 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. */
+/*************************************************************************/
+#ifndef COLOR_RECT_H
+#define COLOR_RECT_H
#include "scene/gui/control.h"
@@ -19,4 +47,4 @@ public:
ColorRect();
};
-#endif // COLORRECT_H
+#endif // COLOR_RECT_H
diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h
index 86b976c4fe..3e9944332f 100644
--- a/scene/gui/graph_edit.h
+++ b/scene/gui/graph_edit.h
@@ -34,7 +34,7 @@
#include "scene/gui/slider.h"
#include "scene/gui/tool_button.h"
#include "scene/gui/spin_box.h"
-#include "texture_frame.h"
+#include "scene/gui/texture_rect.h"
class GraphEdit;
diff --git a/scene/gui/patch_9_frame.cpp b/scene/gui/patch_9_rect.cpp
index 1f6145d5db..698d4aaf29 100644
--- a/scene/gui/patch_9_frame.cpp
+++ b/scene/gui/patch_9_rect.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* patch_9_frame.cpp */
+/* patch_9_rect.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#include "patch_9_frame.h"
+#include "patch_9_rect.h"
#include "servers/visual_server.h"
diff --git a/scene/gui/patch_9_frame.h b/scene/gui/patch_9_rect.h
index d55f4e4f69..b87f2f64ec 100644
--- a/scene/gui/patch_9_frame.h
+++ b/scene/gui/patch_9_rect.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* patch_9_frame.h */
+/* patch_9_rect.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
diff --git a/scene/gui/reference_frame.cpp b/scene/gui/reference_rect.cpp
index 37bc3ae6fb..ff4cdf04fd 100644
--- a/scene/gui/reference_frame.cpp
+++ b/scene/gui/reference_rect.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* reference_frame.cpp */
+/* reference_rect.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -26,9 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#include "reference_frame.h"
+#include "reference_rect.h"
-void ReferenceFrame::_notification(int p_what) {
+void ReferenceRect::_notification(int p_what) {
if (p_what==NOTIFICATION_DRAW) {
@@ -39,6 +39,6 @@ void ReferenceFrame::_notification(int p_what) {
}
}
-ReferenceFrame::ReferenceFrame()
+ReferenceRect::ReferenceRect()
{
}
diff --git a/scene/gui/reference_frame.h b/scene/gui/reference_rect.h
index 8b4a16cb43..be493f346c 100644
--- a/scene/gui/reference_frame.h
+++ b/scene/gui/reference_rect.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* reference_frame.h */
+/* reference_rect.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -26,20 +26,20 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#ifndef REFERENCE_FRAME_H
-#define REFERENCE_FRAME_H
+#ifndef REFERENCE_RECT_H
+#define REFERENCE_RECT_H
#include "scene/gui/control.h"
-class ReferenceFrame : public Control {
+class ReferenceRect : public Control {
- GDCLASS( ReferenceFrame, Control);
+ GDCLASS( ReferenceRect, Control);
protected:
void _notification(int p_what);
public:
- ReferenceFrame();
+ ReferenceRect();
};
-#endif // REFERENCE_FRAME_H
+#endif // REFERENCE_RECT_H
diff --git a/scene/gui/texture_frame.cpp b/scene/gui/texture_rect.cpp
index 6556e487f1..68755c0ac2 100644
--- a/scene/gui/texture_frame.cpp
+++ b/scene/gui/texture_rect.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* texture_frame.cpp */
+/* texture_rect.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#include "texture_frame.h"
+#include "texture_rect.h"
#include "servers/visual_server.h"
void TextureRect::_notification(int p_what) {
diff --git a/scene/gui/texture_frame.h b/scene/gui/texture_rect.h
index dea5b3b0ac..e95d742759 100644
--- a/scene/gui/texture_frame.h
+++ b/scene/gui/texture_rect.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* texture_frame.h */
+/* texture_rect.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index ca3aef6262..3e5af50b36 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -54,9 +54,9 @@
#include "scene/gui/spin_box.h"
#include "scene/gui/option_button.h"
#include "scene/gui/color_picker.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
#include "scene/gui/color_rect.h"
-#include "scene/gui/patch_9_frame.h"
+#include "scene/gui/patch_9_rect.h"
#include "scene/gui/menu_button.h"
#include "scene/gui/check_box.h"
#include "scene/gui/check_button.h"
@@ -81,7 +81,7 @@
#include "scene/gui/grid_container.h"
#include "scene/gui/split_container.h"
#include "scene/gui/video_player.h"
-#include "scene/gui/reference_frame.h"
+#include "scene/gui/reference_rect.h"
#include "scene/gui/graph_node.h"
#include "scene/gui/graph_edit.h"
#include "scene/gui/tool_button.h"
@@ -383,7 +383,7 @@ void register_scene_types() {
ClassDB::register_virtual_class<TreeItem>();
ClassDB::register_class<OptionButton>();
ClassDB::register_class<SpinBox>();
- ClassDB::register_class<ReferenceFrame>();
+ ClassDB::register_class<ReferenceRect>();
ClassDB::register_class<ColorPicker>();
ClassDB::register_class<ColorPickerButton>();
ClassDB::register_class<RichTextLabel>();
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 3c6e65bf41..da8fbafde3 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -934,12 +934,12 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
t->set_stylebox("focus","VButtonArray", focus );
- // ReferenceFrame
+ // ReferenceRect
Ref<StyleBoxTexture> ttnc = make_stylebox( full_panel_bg_png,8,8,8,8);
ttnc->set_draw_center(false);
- t->set_stylebox("border","ReferenceFrame", make_stylebox( reference_border_png,4,4,4,4) );
+ t->set_stylebox("border","ReferenceRect", make_stylebox( reference_border_png,4,4,4,4) );
t->set_stylebox("panelnc","Panel", ttnc );
t->set_stylebox("panelf","Panel", tc_sb );
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 20:22:19 +0000