asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-fixed tabs

Browse source
This commit is contained in:
Juan Linietsky 2015-11-18 04:47:41 -03:00
parent 17bde66cd8
commit 3974fbb852
6 changed files with 151 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
scene/gui/tabs.cpp
View file

@ -58,7 +58,7 @@ Size2 Tabs::get_minimum_size() const {
if (tabs[i].right_button.is_valid()) { if (tabs[i].right_button.is_valid()) {
Ref<Texture> rb=tabs[i].right_button; Ref<Texture> rb=tabs[i].right_button;
Size2 bms = rb->get_size()+get_stylebox("button")->get_minimum_size(); Size2 bms = rb->get_size();//+get_stylebox("button")->get_minimum_size();
bms.width+=get_constant("hseparation"); bms.width+=get_constant("hseparation");
ms.width+=bms.width; ms.width+=bms.width;
@ -67,9 +67,8 @@ Size2 Tabs::get_minimum_size() const {
if (tabs[i].close_button.is_valid()) { if (tabs[i].close_button.is_valid()) {
Ref<Texture> cb=tabs[i].close_button; Ref<Texture> cb=tabs[i].close_button;
Size2 bms = cb->get_size()+get_stylebox("button")->get_minimum_size(); Size2 bms = cb->get_size();//+get_stylebox("button")->get_minimum_size();
bms.width+=get_constant("hseparation"); bms.width+=get_constant("hseparation");
ms.width+=bms.width; ms.width+=bms.width;
ms.height=MAX(bms.height+tab_bg->get_minimum_size().height,ms.height); ms.height=MAX(bms.height+tab_bg->get_minimum_size().height,ms.height);
} }
@ -262,9 +261,9 @@ void Tabs::_notification(int p_what) {
Ref<Texture> rb=tabs[i].right_button; Ref<Texture> rb=tabs[i].right_button;
lsize+=get_constant("hseparation"); lsize+=get_constant("hseparation");
lsize+=style->get_margin(MARGIN_LEFT); //lsize+=style->get_margin(MARGIN_LEFT);
lsize+=rb->get_width(); lsize+=rb->get_width();
lsize+=style->get_margin(MARGIN_RIGHT); //lsize+=style->get_margin(MARGIN_RIGHT);
} }
@ -276,9 +275,9 @@ void Tabs::_notification(int p_what) {
Ref<Texture> rb=tabs[i].close_button; Ref<Texture> rb=tabs[i].close_button;
lsize+=get_constant("hseparation"); lsize+=get_constant("hseparation");
lsize+=style->get_margin(MARGIN_LEFT); //lsize+=style->get_margin(MARGIN_LEFT);
lsize+=rb->get_width(); lsize+=rb->get_width();
lsize+=style->get_margin(MARGIN_RIGHT); //lsize+=style->get_margin(MARGIN_RIGHT);
} }
} break; } break;
@ -289,9 +288,9 @@ void Tabs::_notification(int p_what) {
Ref<Texture> rb=tabs[i].close_button; Ref<Texture> rb=tabs[i].close_button;
lsize+=get_constant("hseparation"); lsize+=get_constant("hseparation");
lsize+=style->get_margin(MARGIN_LEFT); //lsize+=style->get_margin(MARGIN_LEFT);
lsize+=rb->get_width(); lsize+=rb->get_width();
lsize+=style->get_margin(MARGIN_RIGHT); //lsize+=style->get_margin(MARGIN_RIGHT);
} }
} }
@ -303,9 +302,9 @@ void Tabs::_notification(int p_what) {
Ref<Texture> rb=tabs[i].close_button; Ref<Texture> rb=tabs[i].close_button;
lsize+=get_constant("hseparation"); lsize+=get_constant("hseparation");
lsize+=style->get_margin(MARGIN_LEFT); //lsize+=style->get_margin(MARGIN_LEFT);
lsize+=rb->get_width(); lsize+=rb->get_width();
lsize+=style->get_margin(MARGIN_RIGHT); //lsize+=style->get_margin(MARGIN_RIGHT);
} }
} }
@ -404,11 +403,11 @@ void Tabs::_notification(int p_what) {
style->draw(ci,cb_rect); style->draw(ci,cb_rect);
} }
w+=style->get_margin(MARGIN_LEFT); //w+=style->get_margin(MARGIN_LEFT);
cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) )); cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
w+=cb->get_width(); w+=cb->get_width();
w+=style->get_margin(MARGIN_RIGHT); //w+=style->get_margin(MARGIN_RIGHT);
tabs[i].cb_rect=cb_rect; tabs[i].cb_rect=cb_rect;
} }
} break; } break;
@ -432,11 +431,11 @@ void Tabs::_notification(int p_what) {
style->draw(ci,cb_rect); style->draw(ci,cb_rect);
} }
w+=style->get_margin(MARGIN_LEFT); //w+=style->get_margin(MARGIN_LEFT);
cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) )); cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
w+=cb->get_width(); w+=cb->get_width();
w+=style->get_margin(MARGIN_RIGHT); //w+=style->get_margin(MARGIN_RIGHT);
tabs[i].cb_rect=cb_rect; tabs[i].cb_rect=cb_rect;
} }
} }
@ -461,11 +460,11 @@ void Tabs::_notification(int p_what) {
style->draw(ci,cb_rect); style->draw(ci,cb_rect);
} }
w+=style->get_margin(MARGIN_LEFT); //w+=style->get_margin(MARGIN_LEFT);
cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) )); cb->draw(ci,Point2i( w,cb_rect.pos.y+style->get_margin(MARGIN_TOP) ));
w+=cb->get_width(); w+=cb->get_width();
w+=style->get_margin(MARGIN_RIGHT); //w+=style->get_margin(MARGIN_RIGHT);
tabs[i].cb_rect=cb_rect; tabs[i].cb_rect=cb_rect;
} }
} }

13
tools/editor/editor_log.cpp
View file

@ -81,6 +81,7 @@ void EditorLog::_notification(int p_what) {
log->add_color_override("default_color",get_color("font_color","Tree")); log->add_color_override("default_color",get_color("font_color","Tree"));
tb->set_normal_texture( get_icon("Collapse","EditorIcons")); tb->set_normal_texture( get_icon("Collapse","EditorIcons"));
tb->set_hover_texture( get_icon("CollapseHl","EditorIcons")); tb->set_hover_texture( get_icon("CollapseHl","EditorIcons"));
//button->set_icon(get_icon("Console","EditorIcons"));
} }
@ -125,6 +126,7 @@ void EditorLog::add_message(const String& p_msg,bool p_error) {
log->push_color(get_color("fg_error","Editor")); log->push_color(get_color("fg_error","Editor"));
} else { } else {
button->set_icon(Ref<Texture>()); button->set_icon(Ref<Texture>());
} }
@ -154,17 +156,20 @@ void EditorLog::_dragged(const Point2& p_ofs) {
*/ */
ToolButton *EditorLog::get_button() { Button *EditorLog::get_button() {
return button; return button;
} }
void EditorLog::_flip_request() { void EditorLog::_flip_request() {
if (is_visible()) if (is_visible()) {
hide(); hide();
else button->show();
} else {
show(); show();
button->hide();
}
} }
void EditorLog::_undo_redo_cbk(void *p_self,const String& p_name) { void EditorLog::_undo_redo_cbk(void *p_self,const String& p_name) {
@ -200,7 +205,7 @@ EditorLog::EditorLog() {
hb->add_child(title); hb->add_child(title);
button = memnew( ToolButton ); button = memnew( Button );
button->set_text_align(Button::ALIGN_LEFT); button->set_text_align(Button::ALIGN_LEFT);
button->connect("pressed",this,"_flip_request"); button->connect("pressed",this,"_flip_request");
button->set_focus_mode(FOCUS_NONE); button->set_focus_mode(FOCUS_NONE);

4
tools/editor/editor_log.h
View file

@ -44,7 +44,7 @@ class EditorLog : public PanelContainer {
OBJ_TYPE( EditorLog, PanelContainer ); OBJ_TYPE( EditorLog, PanelContainer );
ToolButton *button; Button *button;
Button *clearbutton; Button *clearbutton;
Label *title; Label *title;
RichTextLabel *log; RichTextLabel *log;
@ -73,7 +73,7 @@ public:
void add_message(const String& p_msg, bool p_error=false); void add_message(const String& p_msg, bool p_error=false);
void deinit(); void deinit();
ToolButton *get_button(); Button *get_button();
void clear(); void clear();
EditorLog(); EditorLog();
~EditorLog(); ~EditorLog();

179
tools/editor/editor_node.cpp
View file

@ -111,6 +111,8 @@ EditorNode *EditorNode::singleton=NULL;
void EditorNode::_update_scene_tabs() { void EditorNode::_update_scene_tabs() {
bool show_rb = EditorSettings::get_singleton()->get("global/show_script_in_scene_tabs");
scene_tabs->clear_tabs(); scene_tabs->clear_tabs();
Ref<Texture> script_icon = gui_base->get_icon("Script","EditorIcons"); Ref<Texture> script_icon = gui_base->get_icon("Script","EditorIcons");
for(int i=0;i<editor_data.get_edited_scene_count();i++) { for(int i=0;i<editor_data.get_edited_scene_count();i++) {
@ -133,7 +135,7 @@ void EditorNode::_update_scene_tabs() {
bool unsaved = (i==current)?saved_version!=editor_data.get_undo_redo().get_version():editor_data.get_scene_version(i)!=0; bool unsaved = (i==current)?saved_version!=editor_data.get_undo_redo().get_version():editor_data.get_scene_version(i)!=0;
scene_tabs->add_tab(editor_data.get_scene_title(i)+(unsaved?"(*)":""),icon); scene_tabs->add_tab(editor_data.get_scene_title(i)+(unsaved?"(*)":""),icon);
if (editor_data.get_scene_root_script(i).is_valid()) { if (show_rb && editor_data.get_scene_root_script(i).is_valid()) {
scene_tabs->set_tab_right_button(i,script_icon); scene_tabs->set_tab_right_button(i,script_icon);
} }
@ -169,7 +171,7 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
break;*/ break;*/
case KEY_F1: _editor_select(0); break; case KEY_F1: _editor_select(0); break;
case KEY_F2: _editor_select(1); break; case KEY_F2: _editor_select(1); break;
case KEY_F4: _editor_select(2); break; case KEY_F3: _editor_select(2); break;
case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break; case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break;
case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break; case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break; case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break;
@ -1617,10 +1619,8 @@ void EditorNode::_edit_current() {
for(int i=0;i<editor_table.size();i++) { for(int i=0;i<editor_table.size();i++) {
if (editor_table[i]==main_plugin) {
main_editor_tabs->set_current_tab(i); main_editor_buttons[i]->set_pressed(editor_table[i]==main_plugin);
break;
}
} }
} }
@ -2854,7 +2854,9 @@ void EditorNode::_editor_select(int p_which) {
ERR_FAIL_INDEX(p_which,editor_table.size()); ERR_FAIL_INDEX(p_which,editor_table.size());
main_editor_tabs->set_current_tab(p_which); for(int i=0;i<main_editor_buttons.size();i++) {
main_editor_buttons[i]->set_pressed(i==p_which);
}
selecting=false; selecting=false;
@ -2872,6 +2874,8 @@ void EditorNode::_editor_select(int p_which) {
editor_plugin_screen=new_editor; editor_plugin_screen=new_editor;
editor_plugin_screen->make_visible(true); editor_plugin_screen->make_visible(true);
editor_plugin_screen->selected_notify(); editor_plugin_screen->selected_notify();
} }
void EditorNode::add_editor_plugin(EditorPlugin *p_editor) { void EditorNode::add_editor_plugin(EditorPlugin *p_editor) {
@ -2879,7 +2883,12 @@ void EditorNode::add_editor_plugin(EditorPlugin *p_editor) {
if (p_editor->has_main_screen()) { if (p_editor->has_main_screen()) {
singleton->main_editor_tabs->add_tab(p_editor->get_name()); ToolButton *tb = memnew( ToolButton );
tb->set_toggle_mode(true);
tb->connect("pressed",singleton,"_editor_select",varray(singleton->main_editor_buttons.size()));
tb->set_text(p_editor->get_name());
singleton->main_editor_buttons.push_back(tb);
singleton->main_editor_button_vb->add_child(tb);
singleton->editor_table.push_back(p_editor); singleton->editor_table.push_back(p_editor);
} }
singleton->editor_data.add_editor_plugin( p_editor ); singleton->editor_data.add_editor_plugin( p_editor );
@ -2891,16 +2900,18 @@ void EditorNode::remove_editor_plugin(EditorPlugin *p_editor) {
if (p_editor->has_main_screen()) { if (p_editor->has_main_screen()) {
for(int i=0;i<singleton->main_editor_tabs->get_tab_count();i++) { for(int i=0;i<singleton->main_editor_buttons.size();i++) {
if (p_editor->get_name()==singleton->main_editor_tabs->get_tab_title(i)) { if (p_editor->get_name()==singleton->main_editor_buttons[i]->get_name()) {
memdelete( singleton->main_editor_buttons[i] );
singleton->main_editor_buttons.remove(i);
singleton->main_editor_tabs->remove_tab(i);
break; break;
} }
} }
singleton->main_editor_tabs->add_tab(p_editor->get_name()); //singleton->main_editor_tabs->add_tab(p_editor->get_name());
singleton->editor_table.erase(p_editor); singleton->editor_table.erase(p_editor);
} }
singleton->remove_child(p_editor); singleton->remove_child(p_editor);
@ -3209,10 +3220,20 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
} }
int EditorNode::_get_current_main_editor() {
for(int i=0;i<editor_table.size();i++) {
if (editor_table[i]==editor_plugin_screen)
return i;
}
return 0;
}
Dictionary EditorNode::_get_main_scene_state() { Dictionary EditorNode::_get_main_scene_state() {
Dictionary state; Dictionary state;
state["main_tab"]=main_editor_tabs->get_current_tab(); state["main_tab"]=_get_current_main_editor();
state["scene_tree_offset"]=scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->get_val(); state["scene_tree_offset"]=scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->get_val();
state["property_edit_offset"]=get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_val(); state["property_edit_offset"]=get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_val();
state["saved_version"]=saved_version; state["saved_version"]=saved_version;
@ -4589,6 +4610,7 @@ EditorNode::EditorNode() {
gui_base->add_child(main_vbox); gui_base->add_child(main_vbox);
main_vbox->set_area_as_parent_rect(8); main_vbox->set_area_as_parent_rect(8);
#if 0
PanelContainer *top_dark_panel = memnew( PanelContainer ); PanelContainer *top_dark_panel = memnew( PanelContainer );
Ref<StyleBoxTexture> top_dark_sb; Ref<StyleBoxTexture> top_dark_sb;
top_dark_sb.instance();; top_dark_sb.instance();;
@ -4604,21 +4626,14 @@ EditorNode::EditorNode() {
VBoxContainer *top_dark_vb = memnew( VBoxContainer ); VBoxContainer *top_dark_vb = memnew( VBoxContainer );
main_vbox->add_child(top_dark_panel); main_vbox->add_child(top_dark_panel);
top_dark_panel->add_child(top_dark_vb); top_dark_panel->add_child(top_dark_vb);
#endif
menu_hb = memnew( HBoxContainer ); menu_hb = memnew( HBoxContainer );
top_dark_vb->add_child(menu_hb); main_vbox->add_child(menu_hb);
scene_tabs=memnew( Tabs ); // top_dark_vb->add_child(scene_tabs);
scene_tabs->add_tab("unsaved");
scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
scene_tabs->set_tab_close_display_policy(Tabs::SHOW_HOVER);
scene_tabs->connect("tab_changed",this,"_scene_tab_changed");
scene_tabs->connect("right_button_pressed",this,"_scene_tab_script_edited");
scene_tabs->connect("tab_close", this, "_scene_tab_closed");
top_dark_vb->add_child(scene_tabs);
//left //left
left_l_hsplit = memnew( HSplitContainer ); left_l_hsplit = memnew( HSplitContainer );
main_vbox->add_child(left_l_hsplit); main_vbox->add_child(left_l_hsplit);
@ -4651,11 +4666,15 @@ EditorNode::EditorNode() {
main_hsplit = memnew( HSplitContainer ); main_hsplit = memnew( HSplitContainer );
left_r_hsplit->add_child(main_hsplit); left_r_hsplit->add_child(main_hsplit);
//main_split->set_v_size_flags(Control::SIZE_EXPAND_FILL); //main_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
VBoxContainer * center_vb = memnew( VBoxContainer);
main_hsplit->add_child(center_vb);
center_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
center_split = memnew( VSplitContainer ); center_split = memnew( VSplitContainer );
main_hsplit->add_child(center_split); //main_hsplit->add_child(center_split);
center_split->set_h_size_flags(Control::SIZE_EXPAND_FILL); center_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
center_split->set_collapsed(false); center_split->set_collapsed(false);
center_vb->add_child(center_split);
right_hsplit = memnew( HSplitContainer ); right_hsplit = memnew( HSplitContainer );
main_hsplit->add_child(right_hsplit); main_hsplit->add_child(right_hsplit);
@ -4752,20 +4771,19 @@ EditorNode::EditorNode() {
srt->add_constant_override("separation",0); srt->add_constant_override("separation",0);
main_editor_tabs = memnew( Tabs ); /* main_editor_tabs = memnew( Tabs );
main_editor_tabs->connect("tab_changed",this,"_editor_select"); main_editor_tabs->connect("tab_changed",this,"_editor_select");
main_editor_tabs->set_tab_close_display_policy(Tabs::SHOW_NEVER); main_editor_tabs->set_tab_close_display_policy(Tabs::SHOW_NEVER);
HBoxContainer *srth = memnew( HBoxContainer ); */
srt->add_child( srth ); scene_tabs=memnew( Tabs );
Control *tec = memnew( Control ); scene_tabs->add_tab("unsaved");
tec->set_custom_minimum_size(Size2(100,0)); scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
tec->set_h_size_flags(Control::SIZE_EXPAND_FILL); scene_tabs->set_tab_close_display_policy(Tabs::SHOW_ACTIVE_ONLY);
srth->add_child(tec); scene_tabs->connect("tab_changed",this,"_scene_tab_changed");
srth->add_child(main_editor_tabs); scene_tabs->connect("right_button_pressed",this,"_scene_tab_script_edited");
tec = memnew( Control ); scene_tabs->connect("tab_close", this, "_scene_tab_closed");
tec->set_custom_minimum_size(Size2(100,0));
srth->add_child(tec); srt->add_child(scene_tabs);
tec->set_h_size_flags(Control::SIZE_EXPAND_FILL);
scene_root_parent = memnew( Panel ); scene_root_parent = memnew( Panel );
@ -4842,6 +4860,8 @@ EditorNode::EditorNode() {
anim_close->set_pressed_texture( anim_close->get_icon("Close","EditorIcons")); anim_close->set_pressed_texture( anim_close->get_icon("Close","EditorIcons"));
PanelContainer *top_region = memnew( PanelContainer ); PanelContainer *top_region = memnew( PanelContainer );
top_region->add_style_override("panel",gui_base->get_stylebox("hover","Button")); top_region->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
HBoxContainer *left_menu_hb = memnew( HBoxContainer ); HBoxContainer *left_menu_hb = memnew( HBoxContainer );
@ -4918,6 +4938,18 @@ EditorNode::EditorNode() {
p->add_child(recent_scenes); p->add_child(recent_scenes);
recent_scenes->connect("item_pressed",this,"_open_recent_scene"); recent_scenes->connect("item_pressed",this,"_open_recent_scene");
{
Control *sp = memnew( Control );
sp->set_custom_minimum_size(Size2(30,0));
menu_hb->add_child(sp);
}
PanelContainer *editor_region = memnew( PanelContainer );
editor_region->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
main_editor_button_vb = memnew( HBoxContainer );
editor_region->add_child(main_editor_button_vb);
menu_hb->add_child(editor_region);
//menu_hb->add_spacer(); //menu_hb->add_spacer();
#if 0 #if 0
node_menu = memnew( MenuButton ); node_menu = memnew( MenuButton );
@ -5078,6 +5110,39 @@ EditorNode::EditorNode() {
*/ */
progress_hb = memnew( BackgroundProgress );
menu_hb->add_child(progress_hb);
{
Control *sp = memnew( Control );
sp->set_custom_minimum_size(Size2(30,0));
menu_hb->add_child(sp);
}
PanelContainer *vu_cont = memnew( PanelContainer );
vu_cont->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
menu_hb->add_child(vu_cont);
audio_vu = memnew( TextureProgress );
CenterContainer *vu_cc = memnew( CenterContainer );
vu_cc->add_child(audio_vu);
vu_cont->add_child(vu_cc);
audio_vu->set_under_texture(gui_base->get_icon("VuEmpty","EditorIcons"));
audio_vu->set_progress_texture(gui_base->get_icon("VuFull","EditorIcons"));
audio_vu->set_max(24);
audio_vu->set_min(-80);
audio_vu->set_step(0.01);
audio_vu->set_val(0);
{
Control *sp = memnew( Control );
sp->set_custom_minimum_size(Size2(30,0));
menu_hb->add_child(sp);
}
top_region = memnew( PanelContainer ); top_region = memnew( PanelContainer );
top_region->add_style_override("panel",gui_base->get_stylebox("hover","Button")); top_region->add_style_override("panel",gui_base->get_stylebox("hover","Button"));
HBoxContainer *right_menu_hb = memnew( HBoxContainer ); HBoxContainer *right_menu_hb = memnew( HBoxContainer );
@ -5109,6 +5174,15 @@ EditorNode::EditorNode() {
sources_button->connect("pressed",this,"_menu_option",varray(SOURCES_REIMPORT)); sources_button->connect("pressed",this,"_menu_option",varray(SOURCES_REIMPORT));
sources_button->set_tooltip("Alerts when an external resource has changed."); sources_button->set_tooltip("Alerts when an external resource has changed.");
update_menu = memnew( MenuButton );
update_menu->set_tooltip("Spins when the editor window repaints!");
right_menu_hb->add_child(update_menu);
update_menu->set_icon(gui_base->get_icon("Progress1","EditorIcons"));
p=update_menu->get_popup();
p->add_check_item("Update Always",SETTINGS_UPDATE_ALWAYS);
p->add_check_item("Update Changes",SETTINGS_UPDATE_CHANGES);
p->set_item_checked(1,true);
//sources_button->connect(); //sources_button->connect();
/* /*
@ -5262,6 +5336,8 @@ EditorNode::EditorNode() {
log->connect("close_request",this,"_close_messages"); log->connect("close_request",this,"_close_messages");
log->connect("show_request",this,"_show_messages"); log->connect("show_request",this,"_show_messages");
//left_split->set_dragger_visible(false); //left_split->set_dragger_visible(false);
old_split_ofs=0; old_split_ofs=0;
@ -5279,37 +5355,18 @@ EditorNode::EditorNode() {
animation_editor->hide(); animation_editor->hide();
PanelContainer *bottom_pc = memnew( PanelContainer ); /*PanelContainer *bottom_pc = memnew( PanelContainer );
main_vbox->add_child(bottom_pc); srt->add_child(bottom_pc);
bottom_hb = memnew( HBoxContainer ); bottom_hb = memnew( HBoxContainer );
bottom_pc->add_child(bottom_hb); bottom_pc->add_child(bottom_hb);*/
bottom_hb->add_child( log->get_button() ); center_vb->add_child( log->get_button() );
log->get_button()->set_h_size_flags(Control::SIZE_EXPAND_FILL); log->get_button()->set_h_size_flags(Control::SIZE_EXPAND_FILL);
progress_hb = memnew( BackgroundProgress );
bottom_hb->add_child(progress_hb);
//progress_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL); //progress_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
audio_vu = memnew( TextureProgress );
CenterContainer *vu_cc = memnew( CenterContainer );
vu_cc->add_child(audio_vu);
bottom_hb->add_child(vu_cc);
audio_vu->set_under_texture(gui_base->get_icon("VuEmpty","EditorIcons"));
audio_vu->set_progress_texture(gui_base->get_icon("VuFull","EditorIcons"));
audio_vu->set_max(24);
audio_vu->set_min(-80);
audio_vu->set_step(0.01);
audio_vu->set_val(0);
update_menu = memnew( MenuButton );
update_menu->set_tooltip("Spins when the editor window repaints!");
bottom_hb->add_child(update_menu);
update_menu->set_icon(gui_base->get_icon("Progress1","EditorIcons"));
p=update_menu->get_popup();
p->add_check_item("Update Always",SETTINGS_UPDATE_ALWAYS);
p->add_check_item("Update Changes",SETTINGS_UPDATE_CHANGES);
p->set_item_checked(1,true);
/* /*
animation_menu = memnew( ToolButton ); animation_menu = memnew( ToolButton );

6
tools/editor/editor_node.h
View file

@ -314,7 +314,9 @@ class EditorNode : public Node {
CenterContainer *tabs_center; CenterContainer *tabs_center;
EditorQuickOpen *quick_open; EditorQuickOpen *quick_open;
EditorQuickOpen *quick_run; EditorQuickOpen *quick_run;
Tabs *main_editor_tabs;
HBoxContainer *main_editor_button_vb;
Vector<ToolButton*> main_editor_buttons;
Vector<EditorPlugin*> editor_table; Vector<EditorPlugin*> editor_table;
EditorReImportDialog *reimport_dialog; EditorReImportDialog *reimport_dialog;
@ -508,6 +510,8 @@ class EditorNode : public Node {
Dictionary _get_main_scene_state(); Dictionary _get_main_scene_state();
void _set_main_scene_state(Dictionary p_state); void _set_main_scene_state(Dictionary p_state);
int _get_current_main_editor();
void _save_docks(); void _save_docks();
void _load_docks(); void _load_docks();

2
tools/editor/editor_settings.cpp
View file

@ -447,7 +447,7 @@ void EditorSettings::_load_defaults() {
hints["global/default_project_path"]=PropertyInfo(Variant::STRING,"global/default_project_path",PROPERTY_HINT_GLOBAL_DIR); hints["global/default_project_path"]=PropertyInfo(Variant::STRING,"global/default_project_path",PROPERTY_HINT_GLOBAL_DIR);
set("global/default_project_export_path",""); set("global/default_project_export_path","");
hints["global/default_project_export_path"]=PropertyInfo(Variant::STRING,"global/default_project_export_path",PROPERTY_HINT_GLOBAL_DIR); hints["global/default_project_export_path"]=PropertyInfo(Variant::STRING,"global/default_project_export_path",PROPERTY_HINT_GLOBAL_DIR);
set("global/show_script_in_scene_tabs",false);
set("text_editor/background_color",Color::html("3b000000")); set("text_editor/background_color",Color::html("3b000000"));
set("text_editor/text_color",Color::html("aaaaaa")); set("text_editor/text_color",Color::html("aaaaaa"));
set("text_editor/text_selected_color",Color::html("000000")); set("text_editor/text_selected_color",Color::html("000000"));