godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42904 from Xrayez/rects-rename-fixup 

Fixup `ColorRect` and `TextureRect` renames
This commit is contained in:
Rémi Verschelde 2020-10-19 22:34:40 +02:00 committed by GitHub
parent 858b5d29ef 9c3a33a4e8
commit 17f682226d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/audio_stream_editor_plugin.cpp
View File

@ -44,8 +44,8 @@ void AudioStreamEditor::_notification(int p_what) {
if (p_what == NOTIFICATION_THEME_CHANGED || p_what == NOTIFICATION_ENTER_TREE) { if (p_what == NOTIFICATION_THEME_CHANGED || p_what == NOTIFICATION_ENTER_TREE) {
_play_button->set_icon(get_theme_icon("MainPlay", "EditorIcons")); _play_button->set_icon(get_theme_icon("MainPlay", "EditorIcons"));
_stop_button->set_icon(get_theme_icon("Stop", "EditorIcons")); _stop_button->set_icon(get_theme_icon("Stop", "EditorIcons"));
_preview->set_frame_color(get_theme_color("dark_color_2", "Editor")); _preview->set_color(get_theme_color("dark_color_2", "Editor"));
set_frame_color(get_theme_color("dark_color_1", "Editor")); set_color(get_theme_color("dark_color_1", "Editor"));
_indicator->update(); _indicator->update();
_preview->update(); _preview->update();

14
scene/gui/color_rect.cpp
View File

@ -30,12 +30,12 @@
#include "color_rect.h" #include "color_rect.h"
void ColorRect::set_frame_color(const Color &p_color) { void ColorRect::set_color(const Color &p_color) {
color = p_color; color = p_color;
update(); update();
} }
Color ColorRect::get_frame_color() const { Color ColorRect::get_color() const {
return color; return color;
} }
@ -46,12 +46,8 @@ void ColorRect::_notification(int p_what) {
} }
void ColorRect::_bind_methods() { void ColorRect::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_frame_color", "color"), &ColorRect::set_frame_color); ClassDB::bind_method(D_METHOD("set_color", "color"), &ColorRect::set_color);
ClassDB::bind_method(D_METHOD("get_frame_color"), &ColorRect::get_frame_color); ClassDB::bind_method(D_METHOD("get_color"), &ColorRect::get_color);
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_frame_color", "get_frame_color"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color");
}
ColorRect::ColorRect() {
color = Color(1, 1, 1);
} }

8
scene/gui/color_rect.h
View File

@ -36,17 +36,15 @@
class ColorRect : public Control { class ColorRect : public Control {
GDCLASS(ColorRect, Control); GDCLASS(ColorRect, Control);
Color color; Color color = Color(1, 1, 1);
protected: protected:
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
public: public:
void set_frame_color(const Color &p_color); void set_color(const Color &p_color);
Color get_frame_color() const; Color get_color() const;
ColorRect();
}; };
#endif // COLOR_RECT_H #endif // COLOR_RECT_H

1
scene/gui/nine_patch_rect.h
View File

@ -79,4 +79,5 @@ public:
}; };
VARIANT_ENUM_CAST(NinePatchRect::AxisStretchMode) VARIANT_ENUM_CAST(NinePatchRect::AxisStretchMode)
#endif // NINE_PATCH_RECT_H #endif // NINE_PATCH_RECT_H

7
scene/gui/texture_rect.h
View File

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#ifndef TEXTURE_FRAME_H #ifndef TEXTURE_RECT_H
#define TEXTURE_FRAME_H #define TEXTURE_RECT_H
#include "scene/gui/control.h" #include "scene/gui/control.h"
@ -83,4 +83,5 @@ public:
}; };
VARIANT_ENUM_CAST(TextureRect::StretchMode); VARIANT_ENUM_CAST(TextureRect::StretchMode);
#endif // TEXTURE_FRAME_H
#endif // TEXTURE_RECT_H