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

Revert "fixed loading old theme styleboxes"

This commit is contained in:
Juan Linietsky 2017-08-07 16:00:34 -03:00 committed by GitHub
parent cd9539f85d
commit a0d969c560
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/asset_library_editor_plugin.cpp
View File

@ -281,7 +281,7 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
description = memnew(RichTextLabel); description = memnew(RichTextLabel);
description->connect("meta_clicked", this, "_link_click"); description->connect("meta_clicked", this, "_link_click");
desc_bg->add_child(description); desc_bg->add_child(description);
desc_bg->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("normal", "TextEdit")); desc_bg->add_style_override("panel", get_stylebox("normal", "TextEdit"));
preview = memnew(TextureRect); preview = memnew(TextureRect);
preview->set_custom_minimum_size(Size2(640, 345)); preview->set_custom_minimum_size(Size2(640, 345));
@ -290,7 +290,7 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() {
PanelContainer *previews_bg = memnew(PanelContainer); PanelContainer *previews_bg = memnew(PanelContainer);
vbox->add_child(previews_bg); vbox->add_child(previews_bg);
previews_bg->set_custom_minimum_size(Size2(0, 85)); previews_bg->set_custom_minimum_size(Size2(0, 85));
previews_bg->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("normal", "TextEdit")); previews_bg->add_style_override("panel", get_stylebox("normal", "TextEdit"));
previews = memnew(ScrollContainer); previews = memnew(ScrollContainer);
previews_bg->add_child(previews); previews_bg->add_child(previews);
@ -1362,7 +1362,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
PanelContainer *library_scroll_bg = memnew(PanelContainer); PanelContainer *library_scroll_bg = memnew(PanelContainer);
library_main->add_child(library_scroll_bg); library_main->add_child(library_scroll_bg);
library_scroll_bg->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("bg", "Tree")); library_scroll_bg->add_style_override("panel", get_stylebox("normal", "TextEdit"));
library_scroll_bg->set_v_size_flags(SIZE_EXPAND_FILL); library_scroll_bg->set_v_size_flags(SIZE_EXPAND_FILL);
library_scroll = memnew(ScrollContainer); library_scroll = memnew(ScrollContainer);

2
editor/editor_help.cpp
View File

@ -1788,7 +1788,7 @@ void EditorHelpBit::_bind_methods() {
void EditorHelpBit::_notification(int p_what) { void EditorHelpBit::_notification(int p_what) {
if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
add_style_override("panel", get_stylebox("ScriptPanel", "EditorStyles")); add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("ScriptPanel", "EditorStyles"));
} }
} }

2
editor/io_plugins/editor_scene_import_plugin.cpp
View File

@ -1307,7 +1307,7 @@ EditorSceneImportDialog::EditorSceneImportDialog(EditorNode *p_editor, EditorSce
//confirm_import->set_child_rect(cvb); //confirm_import->set_child_rect(cvb);
PanelContainer *pc = memnew( PanelContainer ); PanelContainer *pc = memnew( PanelContainer );
pc->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("normal","TextEdit")); pc->add_style_override("panel",get_stylebox("normal","TextEdit"));
//ec->add_child(pc); //ec->add_child(pc);
missing_files = memnew( RichTextLabel ); missing_files = memnew( RichTextLabel );
cvb->add_margin_child(TTR("The Following Files are Missing:"),pc,true); cvb->add_margin_child(TTR("The Following Files are Missing:"),pc,true);

2
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -1246,7 +1246,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
set_focus_mode(FOCUS_ALL); set_focus_mode(FOCUS_ALL);
player = NULL; player = NULL;
add_style_override("panel", editor->get_gui_base()->get_stylebox("panel", "Panel")); add_style_override("panel", get_stylebox("panel", "Panel"));
Label *l; Label *l;

2
editor/plugins/resource_preloader_editor_plugin.cpp
View File

@ -362,7 +362,7 @@ void ResourcePreloaderEditor::_bind_methods() {
ResourcePreloaderEditor::ResourcePreloaderEditor() { ResourcePreloaderEditor::ResourcePreloaderEditor() {
//add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("panel","Panel")); //add_style_override("panel", get_stylebox("panel","Panel"));
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
add_child(vbc); add_child(vbc);

2
editor/plugins/sample_editor_plugin.cpp
View File

@ -360,7 +360,7 @@ SampleEditor::SampleEditor() {
player = memnew(SamplePlayer); player = memnew(SamplePlayer);
add_child(player); add_child(player);
add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("panel","Panel")); add_style_override("panel", get_stylebox("panel","Panel"));
library = Ref<SampleLibrary>(memnew(SampleLibrary)); library = Ref<SampleLibrary>(memnew(SampleLibrary));
player->set_sample_library(library); player->set_sample_library(library);
sample_texframe = memnew( TextureRect ); sample_texframe = memnew( TextureRect );

2
editor/plugins/sample_library_editor_plugin.cpp
View File

@ -432,7 +432,7 @@ SampleLibraryEditor::SampleLibraryEditor() {
player = memnew(SamplePlayer); player = memnew(SamplePlayer);
add_child(player); add_child(player);
add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("panel","Panel")); add_style_override("panel", get_stylebox("panel","Panel"));
load = memnew( Button ); load = memnew( Button );

2
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -714,7 +714,7 @@ void SpriteFramesEditor::_bind_methods() {
SpriteFramesEditor::SpriteFramesEditor() { SpriteFramesEditor::SpriteFramesEditor() {
//add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("panel","Panel")); //add_style_override("panel", get_stylebox("panel","Panel"));
split = memnew(HSplitContainer); split = memnew(HSplitContainer);
add_child(split); add_child(split);