summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-10-12 14:01:32 +0200
committerGitHub <noreply@github.com>2017-10-12 14:01:32 +0200
commit3b76eea23373e1cee2eee5c7e89d3787fd0f405f (patch)
tree3394c169312586c079c0f4e66058270be68b6454 /scene
parent552384e737c41f8755787afcec9946e4b7663189 (diff)
parent5194c0399259cc3c16dd966c47141179f8b5d98a (diff)
Merge pull request #12032 from Grosskopf/seperation-bugfix
Turned around minimum size scaling for seperator. Fixes #12020
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/separator.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scene/gui/separator.cpp b/scene/gui/separator.cpp
index 3db234f7cc..55d837458a 100644
--- a/scene/gui/separator.cpp
+++ b/scene/gui/separator.cpp
@@ -32,7 +32,11 @@
Size2 Separator::get_minimum_size() const {
Size2 ms(3, 3);
- ms[orientation] = get_constant("separation");
+ if (orientation == VERTICAL) {
+ ms.x = get_constant("separation");
+ } else { // HORIZONTAL
+ ms.y = get_constant("separation");
+ }
return ms;
}