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

Merge pull request #50478 from KoBeWi/xalign

Browse source 
[3.x] Fix valign with stylebox borders
This commit is contained in:
Rémi Verschelde 2021-07-15 15:22:13 +02:00 committed by GitHub
commit 50790a5893
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/gui/label.cpp
View file

@ -118,25 +118,29 @@ void Label::_notification(int p_what) {
lines_visible = max_lines_visible;
}
float total_h = 0;
total_h += lines_visible * font_h;
total_h += style->get_margin(MARGIN_TOP) + style->get_margin(MARGIN_BOTTOM);
if (lines_visible > 0) {
switch (valign) {
case VALIGN_TOP: {
//nothing
} break;
case VALIGN_CENTER: {
vbegin = (size.y - (lines_visible * font_h - line_spacing)) / 2;
vbegin = (size.y - (total_h - line_spacing)) / 2;
vsep = 0;
} break;
case VALIGN_BOTTOM: {
vbegin = size.y - (lines_visible * font_h - line_spacing);
vbegin = size.y - (total_h - line_spacing);
vsep = 0;
} break;
case VALIGN_FILL: {
vbegin = 0;
if (lines_visible > 1) {
vsep = (size.y - (lines_visible * font_h - line_spacing)) / (lines_visible - 1);
vsep = (size.y - (total_h - line_spacing)) / (lines_visible - 1);
} else {
vsep = 0;
}