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

Merge pull request #10166 from toger5/asset_lib_style_overrides

Browse source 
fixed loading old theme styleboxes.
This commit is contained in:
Juan Linietsky 2017-08-15 20:00:44 -03:00 • committed by GitHub
commit 6380975ee2
9 changed files with 72 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/plugins/animation_player_editor_plugin.cpp
View file

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

2
editor/plugins/resource_preloader_editor_plugin.cpp
View file

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

2
editor/plugins/sample_editor_plugin.cpp
View file

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

2
editor/plugins/sample_library_editor_plugin.cpp
View file

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

2
editor/plugins/sprite_frames_editor_plugin.cpp
View file

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