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

Merge pull request #33051 from volzhs/inspector-stylebox

Browse source 
Make stylebox preview not to expand Inspector panel
This commit is contained in:
Rémi Verschelde 2019-10-25 07:39:14 +02:00 committed by GitHub
commit 325232fbc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editor/plugins/style_box_editor_plugin.cpp
View file

@ -64,21 +64,24 @@ void StyleBoxPreview::edit(const Ref<StyleBox> &p_stylebox) {
void StyleBoxPreview::_sb_changed() { void StyleBoxPreview::_sb_changed() {
preview->update(); preview->update();
}
void StyleBoxPreview::_redraw() {
if (stylebox.is_valid()) { if (stylebox.is_valid()) {
Size2 ms = stylebox->get_minimum_size() * 4 / 3; preview->draw_style_box(stylebox, preview->get_rect());
ms.height = MAX(ms.height, 150 * EDSCALE);
preview->set_custom_minimum_size(ms);
} }
} }
void StyleBoxPreview::_bind_methods() { void StyleBoxPreview::_bind_methods() {
ClassDB::bind_method("_sb_changed", &StyleBoxPreview::_sb_changed); ClassDB::bind_method("_sb_changed", &StyleBoxPreview::_sb_changed);
ClassDB::bind_method("_redraw", &StyleBoxPreview::_redraw);
} }
StyleBoxPreview::StyleBoxPreview() { StyleBoxPreview::StyleBoxPreview() {
preview = memnew(Control);
preview = memnew(Panel); preview->set_custom_minimum_size(Size2(0, 150 * EDSCALE));
preview->connect("draw", this, "_redraw");
add_margin_child(TTR("Preview:"), preview); add_margin_child(TTR("Preview:"), preview);
} }

3
editor/plugins/style_box_editor_plugin.h
View file

@ -41,10 +41,11 @@ class StyleBoxPreview : public VBoxContainer {
GDCLASS(StyleBoxPreview, VBoxContainer); GDCLASS(StyleBoxPreview, VBoxContainer);
Panel *preview; Control *preview;
Ref<StyleBox> stylebox; Ref<StyleBox> stylebox;
void _sb_changed(); void _sb_changed();
void _redraw();
protected: protected:
static void _bind_methods(); static void _bind_methods();