Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

some class renames

Browse source 
TextureFrame -> TextureRect
Patch9Frame -> NinePatchRect
ColorFrame -> ColorRect
This commit is contained in:
Juan Linietsky 2017-01-12 18:27:27 -03:00
parent a971186c26
commit da477b76a9
43 changed files with 119 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -3785,7 +3785,7 @@ void CanvasItemEditorViewport::_create_nodes(Node* parent, Node* child, String&
}
Transform2D trans=canvas->get_canvas_transform();
Point2 target_pos = (p_point-trans.get_origin())/trans.get_scale().x-pos;
if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureFrame" || default_type=="Patch9Frame") {
if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureRect" || default_type=="Patch9Frame") {
target_pos -= texture_size/2;
}
editor_data->get_undo_redo().add_do_method(child,"set_pos",target_pos);
@ -3857,8 +3857,8 @@ void CanvasItemEditorViewport::_perform_drop_data(){
else if (default_type=="Particles2D") child=memnew(Particles2D);
else if (default_type=="Polygon2D") child=memnew(Polygon2D);
else if (default_type=="TouchScreenButton") child=memnew(TouchScreenButton);
else if (default_type=="TextureFrame") child=memnew(TextureFrame);
else if (default_type=="Patch9Frame") child=memnew(Patch9Frame);
else if (default_type=="TextureRect") child=memnew(TextureRect);
else if (default_type=="Patch9Frame") child=memnew(NinePatchRect);
else child=memnew(Sprite); // default
_create_nodes(target_node, child, path, drop_pos);
@ -3992,7 +3992,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte
types.push_back("Polygon2D");
types.push_back("TouchScreenButton");
// Control
types.push_back("TextureFrame");
types.push_back("TextureRect");
types.push_back("Patch9Frame");
target_node=NULL;

2
tools/editor/plugins/polygon_2d_editor_plugin.cpp
View file

@ -949,7 +949,7 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
uv_mode_hb->add_child(sb_step_y);
uv_mode_hb->add_child( memnew( VSeparator ));
uv_icon_zoom = memnew( TextureFrame );
uv_icon_zoom = memnew( TextureRect );
uv_mode_hb->add_child( uv_icon_zoom );
uv_zoom = memnew( HSlider );
uv_zoom->set_min(0.01);

2
tools/editor/plugins/polygon_2d_editor_plugin.h
View file

@ -77,7 +77,7 @@ class Polygon2DEditor : public HBoxContainer {
HScrollBar *uv_hscroll;
VScrollBar *uv_vscroll;
MenuButton *uv_menu;
TextureFrame *uv_icon_zoom;
TextureRect *uv_icon_zoom;
Vector2 uv_draw_ofs;
float uv_draw_zoom;

2
tools/editor/plugins/sample_editor_plugin.cpp
View file

@ -361,7 +361,7 @@ SampleEditor::SampleEditor() {
add_style_override("panel", get_stylebox("panel","Panel"));
library = Ref<SampleLibrary>(memnew(SampleLibrary));
player->set_sample_library(library);
sample_texframe = memnew( TextureFrame );
sample_texframe = memnew( TextureRect );
add_child(sample_texframe);
sample_texframe->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5);
sample_texframe->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5);

2
tools/editor/plugins/sample_editor_plugin.h
View file

@ -47,7 +47,7 @@ class SampleEditor : public Panel {
Ref<ImageTexture> peakdisplay;
Ref<Sample> sample;
Ref<SampleLibrary> library;
TextureFrame *sample_texframe;
TextureRect *sample_texframe;
Button *stop;
Button *play;

2
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -2178,7 +2178,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
menu_hb->add_spacer();
script_icon = memnew( TextureFrame );
script_icon = memnew( TextureRect );
menu_hb->add_child(script_icon);
script_name_label = memnew( Label );
menu_hb->add_child(script_name_label);

2
tools/editor/plugins/script_editor_plugin.h
View file

@ -179,7 +179,7 @@ class ScriptEditor : public VBoxContainer {
String current_theme;
TextureFrame *script_icon;
TextureRect *script_icon;
Label *script_name_label;
ToolButton *script_back;

6
tools/editor/plugins/shader_graph_editor_plugin.cpp
View file

@ -2315,7 +2315,7 @@ void ShaderGraphView::_create_node(int p_id) {
gn->add_child(le);
le->set_text(graph->input_node_get_name(type,p_id));
le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
TextureFrame *tex = memnew( TextureFrame );
TextureRect *tex = memnew( TextureRect );
tex->set_expand(true);
tex->set_custom_minimum_size(Size2(80,80));
tex->set_drag_forwarding(this);
@ -2530,7 +2530,7 @@ void ShaderGraphView::_sg_updated() {
Variant ShaderGraphView::get_drag_data_fw(const Point2 &p_point, Control *p_from)
{
TextureFrame* frame = p_from->cast_to<TextureFrame>();
TextureRect* frame = p_from->cast_to<TextureRect>();
if (!frame)
return Variant();
@ -2576,7 +2576,7 @@ void ShaderGraphView::drop_data_fw(const Point2 &p_point, const Variant &p_data,
if (!can_drop_data_fw(p_point, p_data, p_from))
return;
TextureFrame *frame = p_from->cast_to<TextureFrame>();
TextureRect *frame = p_from->cast_to<TextureRect>();
if (!frame)
return;

4
tools/editor/plugins/texture_region_editor_plugin.cpp
View file

@ -643,7 +643,7 @@ void TextureRegionEditor::edit(Object *p_obj)
atlas_tex->disconnect("atlas_changed",this,"_edit_region");
if (p_obj) {
node_sprite = p_obj->cast_to<Sprite>();
node_patch9 = p_obj->cast_to<Patch9Frame>();
node_patch9 = p_obj->cast_to<NinePatchRect>();
if (p_obj->cast_to<StyleBoxTexture>())
obj_styleBox = Ref<StyleBoxTexture>(p_obj->cast_to<StyleBoxTexture>());
if (p_obj->cast_to<AtlasTexture>()) {
@ -897,7 +897,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
separator->set_h_size_flags(Control::SIZE_EXPAND_FILL);
hb_tools->add_child(separator);
icon_zoom = memnew( TextureFrame );
icon_zoom = memnew( TextureRect );
hb_tools->add_child(icon_zoom);
zoom_out = memnew( ToolButton );

4
tools/editor/plugins/texture_region_editor_plugin.h
View file

@ -53,7 +53,7 @@ class TextureRegionEditor : public Control {
friend class TextureRegionEditorPlugin;
MenuButton *snap_mode_button;
TextureFrame *icon_zoom;
TextureRect *icon_zoom;
ToolButton *zoom_in;
ToolButton *zoom_reset;
ToolButton *zoom_out;
@ -81,7 +81,7 @@ class TextureRegionEditor : public Control {
Vector2 snap_step;
Vector2 snap_separation;
Patch9Frame *node_patch9;
NinePatchRect *node_patch9;
Sprite *node_sprite;
Ref<StyleBoxTexture> obj_styleBox;
Ref<AtlasTexture> atlas_tex;