godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Replace TileMapEditor floating tile palette with HSplitContainer.

Browse Source
This commit is contained in:
Carl Olsson
2014-12-29 08:37:25 +10:00
parent 530d717a67
commit 4faf47eb50
4 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -2683,6 +2683,11 @@ void CanvasItemEditor::add_control_to_menu_panel(Control *p_control) {
hb->add_child(p_control);
}
HSplitContainer *CanvasItemEditor::get_palette_split() {
return palette_split;
}
CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
tool = TOOL_SELECT;
@@ -2697,15 +2702,20 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
add_child( hb );
hb->set_area_as_parent_rect();
palette_split = memnew( HSplitContainer);
palette_split->set_v_size_flags(SIZE_EXPAND_FILL);
add_child(palette_split);
Control *vp_base = memnew (Control);
add_child(vp_base);
vp_base->set_v_size_flags(SIZE_EXPAND_FILL);
palette_split->add_child(vp_base);
Control *vp = memnew (Control);
vp_base->add_child(vp);
vp->set_area_as_parent_rect();
vp->add_child(p_editor->get_scene_root());
viewport = memnew( Control );
vp_base->add_child(viewport);
viewport->set_area_as_parent_rect();