diff options
Diffstat (limited to 'tools/editor')
30 files changed, 46 insertions, 46 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index be4d5f48e2..712bc6543e 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -4001,7 +4001,7 @@ AnimationKeyEditor::AnimationKeyEditor() { //menu->set_pos(Point2()); //add_child(menu); - zoomicon = memnew( TextureFrame ); + zoomicon = memnew( TextureRect ); hb->add_child(zoomicon); zoomicon->set_tooltip(TTR("Animation zoom.")); diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h index 0c9b0b5ac6..e81c46a99f 100644 --- a/tools/editor/animation_editor.h +++ b/tools/editor/animation_editor.h @@ -177,7 +177,7 @@ class AnimationKeyEditor : public VBoxContainer { PopupMenu *type_menu; Control *ec; - TextureFrame *zoomicon; + TextureRect *zoomicon; HSlider *zoom; //MenuButton *menu; SpinBox *length; diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp index 11d7a2b58b..23e1ba9776 100644 --- a/tools/editor/asset_library_editor_plugin.cpp +++ b/tools/editor/asset_library_editor_plugin.cpp @@ -147,7 +147,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() { vb->add_child(rating_hb); for(int i=0;i<5;i++) { - stars[i]=memnew(TextureFrame); + stars[i]=memnew(TextureRect); rating_hb->add_child(stars[i]); } price = memnew( Label ); @@ -296,7 +296,7 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() { desc_bg->add_child(description); desc_bg->add_style_override("panel",get_stylebox("normal","TextEdit")); - preview = memnew( TextureFrame ); + preview = memnew( TextureRect ); preview->set_custom_minimum_size(Size2(640,345)); hbox->add_child(preview); @@ -485,7 +485,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { HBoxContainer *hb = memnew( HBoxContainer); add_child(hb); - icon = memnew( TextureFrame ); + icon = memnew( TextureRect ); hb->add_child(icon); VBoxContainer *vb = memnew( VBoxContainer ); @@ -555,7 +555,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { void EditorAssetLibrary::_notification(int p_what) { if (p_what==NOTIFICATION_READY) { - TextureFrame *tf = memnew(TextureFrame); + TextureRect *tf = memnew(TextureRect); tf->set_texture(get_icon("Error","EditorIcons")); reverse->set_icon(get_icon("Updown","EditorIcons")); diff --git a/tools/editor/asset_library_editor_plugin.h b/tools/editor/asset_library_editor_plugin.h index 4ae229cefe..0598ea90ea 100644 --- a/tools/editor/asset_library_editor_plugin.h +++ b/tools/editor/asset_library_editor_plugin.h @@ -58,7 +58,7 @@ class EditorAssetLibraryItem : public PanelContainer { LinkButton* title; LinkButton* category; LinkButton* author; - TextureFrame *stars[5]; + TextureRect *stars[5]; Label* price; int asset_id; @@ -104,7 +104,7 @@ class EditorAssetLibraryItemDescription : public ConfirmationDialog { }; Vector<Preview> preview_images; - TextureFrame *preview; + TextureRect *preview; void set_image(int p_type,int p_index,const Ref<Texture>& p_image); @@ -138,7 +138,7 @@ class EditorAssetLibraryItemDownload : public PanelContainer { GDCLASS(EditorAssetLibraryItemDownload, PanelContainer); - TextureFrame *icon; + TextureRect *icon; Label* title; ProgressBar *progress; Button *install; diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index 408818f729..cfa1bde478 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -1405,7 +1405,7 @@ EditorFileDialog::EditorFileDialog() { filter_hb->add_child(preview_vb); CenterContainer *prev_cc = memnew( CenterContainer ); preview_vb->add_margin_child(TTR("Preview:"),prev_cc); - preview = memnew( TextureFrame ); + preview = memnew( TextureRect ); prev_cc->add_child(preview); preview_vb->hide(); diff --git a/tools/editor/editor_file_dialog.h b/tools/editor/editor_file_dialog.h index e2a40cd5df..04ee0cc55f 100644 --- a/tools/editor/editor_file_dialog.h +++ b/tools/editor/editor_file_dialog.h @@ -93,7 +93,7 @@ private: OptionButton *drives; ItemList *item_list; - TextureFrame *preview; + TextureRect *preview; VBoxContainer *preview_vb; HBoxContainer *list_hb; LineEdit *file; diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 98c59208d2..92087858f5 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -5057,7 +5057,7 @@ Variant EditorNode::drag_resource(const Ref<Resource>& p_res,Control* p_from) { Control *drag_control = memnew( Control ); - TextureFrame *drag_preview = memnew( TextureFrame ); + TextureRect *drag_preview = memnew( TextureRect ); Label* label=memnew( Label ); waiting_for_sources_changed=true; // @@ -6432,7 +6432,7 @@ EditorNode::EditorNode() { about_text->set_pos(Point2(gui_base->get_icon("Logo","EditorIcons")->get_size().width+30,20)); gui_base->add_child(about); about->add_child(about_text); - TextureFrame *logo = memnew( TextureFrame ); + TextureRect *logo = memnew( TextureRect ); about->add_child(logo); logo->set_pos(Point2(20,20)); logo->set_texture(gui_base->get_icon("Logo","EditorIcons") ); diff --git a/tools/editor/editor_profiler.cpp b/tools/editor/editor_profiler.cpp index c527aae385..8522012113 100644 --- a/tools/editor/editor_profiler.cpp +++ b/tools/editor/editor_profiler.cpp @@ -708,7 +708,7 @@ EditorProfiler::EditorProfiler() variables->connect("item_edited",this,"_item_edited"); - graph = memnew( TextureFrame ); + graph = memnew( TextureRect ); graph->set_expand(true); graph->set_mouse_filter(MOUSE_FILTER_STOP); //graph->set_ignore_mouse(false); diff --git a/tools/editor/editor_profiler.h b/tools/editor/editor_profiler.h index 233bc2e0fd..ec1cd9fb5b 100644 --- a/tools/editor/editor_profiler.h +++ b/tools/editor/editor_profiler.h @@ -71,7 +71,7 @@ public: private: Button *activate; - TextureFrame *graph; + TextureRect *graph; Ref<ImageTexture> graph_texture; PoolVector<uint8_t> graph_image; Tree *variables; diff --git a/tools/editor/filesystem_dock.cpp b/tools/editor/filesystem_dock.cpp index 1bf91d4ceb..ff07d22900 100644 --- a/tools/editor/filesystem_dock.cpp +++ b/tools/editor/filesystem_dock.cpp @@ -1770,8 +1770,8 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { path_hb->add_child(search_box); search_box->connect("text_changed",this,"_search_changed"); - search_icon = memnew( TextureFrame ); - search_icon->set_stretch_mode(TextureFrame::STRETCH_KEEP_CENTERED); + search_icon = memnew( TextureRect ); + search_icon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); path_hb->add_child(search_icon); button_display_mode = memnew( ToolButton ); diff --git a/tools/editor/filesystem_dock.h b/tools/editor/filesystem_dock.h index 804017be73..0b0a73b9a2 100644 --- a/tools/editor/filesystem_dock.h +++ b/tools/editor/filesystem_dock.h @@ -95,7 +95,7 @@ private: Button *button_hist_prev; LineEdit *current_path; LineEdit *search_box; - TextureFrame *search_icon; + TextureRect *search_icon; HBoxContainer *path_hb; bool split_mode; diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index 388ca4ca89..bf9c9835f6 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -1579,7 +1579,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe Ref<ImageTexture> atlast = memnew( ImageTexture ); atlast->create_from_image(atlas); // atlast->create_from_image(font_data_list[5]->blit); - TextureFrame *tf = memnew( TextureFrame ); + TextureRect *tf = memnew( TextureRect ); tf->set_texture(atlast); dialog->add_child(tf); } diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 1abbac4539..977fa55e48 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -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; diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp index ee625cf703..dc56348700 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp @@ -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); diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.h b/tools/editor/plugins/polygon_2d_editor_plugin.h index bff7f4c44c..6011ee1f87 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.h +++ b/tools/editor/plugins/polygon_2d_editor_plugin.h @@ -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; diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp index 12ec7c8260..afc151b900 100644 --- a/tools/editor/plugins/sample_editor_plugin.cpp +++ b/tools/editor/plugins/sample_editor_plugin.cpp @@ -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); diff --git a/tools/editor/plugins/sample_editor_plugin.h b/tools/editor/plugins/sample_editor_plugin.h index 59cdb10304..6a416ddfbf 100644 --- a/tools/editor/plugins/sample_editor_plugin.h +++ b/tools/editor/plugins/sample_editor_plugin.h @@ -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; diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 89a85b4ba0..4219457286 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -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); diff --git a/tools/editor/plugins/script_editor_plugin.h b/tools/editor/plugins/script_editor_plugin.h index 26120c8497..655568e262 100644 --- a/tools/editor/plugins/script_editor_plugin.h +++ b/tools/editor/plugins/script_editor_plugin.h @@ -179,7 +179,7 @@ class ScriptEditor : public VBoxContainer { String current_theme; - TextureFrame *script_icon; + TextureRect *script_icon; Label *script_name_label; ToolButton *script_back; diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index 2ff9f94d99..fa28129b6d 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -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; diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp index 50e2cfb199..ca49684063 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.cpp +++ b/tools/editor/plugins/texture_region_editor_plugin.cpp @@ -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 ); diff --git a/tools/editor/plugins/texture_region_editor_plugin.h b/tools/editor/plugins/texture_region_editor_plugin.h index 32cf389c35..c529e54dd1 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.h +++ b/tools/editor/plugins/texture_region_editor_plugin.h @@ -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; diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 27f2f7dbc9..94fbfda2cc 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -288,7 +288,7 @@ void ProjectExportDialog::_notification(int p_what) { CenterContainer *cc = memnew( CenterContainer ); - TextureFrame *tf = memnew( TextureFrame); + TextureRect *tf = memnew( TextureRect); tf->set_texture(get_icon("ErrorSign","EditorIcons")); cc->add_child(tf); plat_errors->add_child(cc); @@ -1578,7 +1578,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) { ScrollContainer *scroll = memnew( ScrollContainer ); atlas_preview_dialog->add_child(scroll); //atlas_preview_dialog->set_child_rect(scroll); - atlas_preview_frame = memnew( TextureFrame ); + atlas_preview_frame = memnew( TextureRect ); scroll->add_child(atlas_preview_frame); add_child(atlas_preview_dialog); diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h index 2110c54b9d..433f4502a1 100644 --- a/tools/editor/project_export.h +++ b/tools/editor/project_export.h @@ -134,7 +134,7 @@ private: AcceptDialog *atlas_preview_dialog; - TextureFrame *atlas_preview_frame; + TextureRect *atlas_preview_frame; VBoxContainer *script_vbox; diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index fa41090624..74c9d3fa5a 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -869,7 +869,7 @@ void ProjectManager::_load_recent_projects() { favorite_box->add_child(favorite); hb->add_child(favorite_box); - TextureFrame *tf = memnew( TextureFrame ); + TextureRect *tf = memnew( TextureRect ); tf->set_texture(icon); hb->add_child(tf); diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 59538ffc6a..83b2013b66 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -2084,7 +2084,7 @@ CustomPropertyEditor::CustomPropertyEditor() { scene_tree->connect("selected", this,"_node_path_selected"); scene_tree->get_scene_tree()->set_show_enabled_subscene(true); - texture_preview = memnew( TextureFrame ); + texture_preview = memnew( TextureRect ); add_child( texture_preview); texture_preview->hide(); diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h index 8f429ab979..305da055a4 100644 --- a/tools/editor/property_editor.h +++ b/tools/editor/property_editor.h @@ -96,7 +96,7 @@ class CustomPropertyEditor : public Popup { Button *action_buttons[MAX_ACTION_BUTTONS]; MenuButton *type_button; Vector<String> inheritors_array; - TextureFrame *texture_preview; + TextureRect *texture_preview; ColorPicker *color_picker; TextEdit *text_edit; bool read_only; diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index c171c49c7b..18b3408816 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1926,9 +1926,9 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec filter = memnew( LineEdit ); filter->set_h_size_flags(SIZE_EXPAND_FILL); filter_hbc->add_child(filter); - filter_icon = memnew( TextureFrame ); + filter_icon = memnew( TextureRect ); filter_hbc->add_child(filter_icon); - filter_icon->set_stretch_mode(TextureFrame::STRETCH_KEEP_CENTERED); + filter_icon->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED); filter->connect("text_changed",this,"_filter_changed"); diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h index 8dade67337..0699da3474 100644 --- a/tools/editor/scene_tree_dock.h +++ b/tools/editor/scene_tree_dock.h @@ -102,7 +102,7 @@ class SceneTreeDock : public VBoxContainer { EditorFileDialog *new_scene_from_dialog; LineEdit *filter; - TextureFrame *filter_icon; + TextureRect *filter_icon; PopupMenu * menu; diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 1c881dfd5e..2b42fab516 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -953,7 +953,7 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2& p_point,Control* p_from) if (i<list_max){ HBoxContainer *hb = memnew( HBoxContainer ); - TextureFrame *tf = memnew(TextureFrame); + TextureRect *tf = memnew(TextureRect); tf->set_texture(icons[i]); hb->add_child(tf); Label *label = memnew( Label( selected[i]->get_name() ) ); |