summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-05-17 18:02:16 -0300
committerJuan Linietsky <reduzio@gmail.com>2018-05-17 18:03:05 -0300
commit4b5227ff7755aa19aa57452c49e9466252fcb4a0 (patch)
tree2adcced443c368d5d2ad2c71e2fae631af1e2411 /scene/resources
parent3183375135e7e9d7bdab2b318dd74f672ebda27d (diff)
-Ability to open resources in the same window
-Plenty of fixes and improvements to new inspector -Fixes that were needed to make inspector work better
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/style_box.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp
index 7da65ac984..ebad00b068 100644
--- a/scene/resources/style_box.cpp
+++ b/scene/resources/style_box.cpp
@@ -136,8 +136,17 @@ Ref<Texture> StyleBoxTexture::get_normal_map() const {
void StyleBoxTexture::set_margin_size(Margin p_margin, float p_size) {
+ ERR_FAIL_INDEX(p_margin, 4);
+
margin[p_margin] = p_size;
emit_changed();
+ static const char *margin_prop[4] = {
+ "content_margin_left",
+ "content_margin_top",
+ "content_margin_right",
+ "content_margin_bottom",
+ };
+ _change_notify(margin_prop[p_margin]);
}
float StyleBoxTexture::get_margin_size(Margin p_margin) const {