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

Merge pull request #9746 from Noshyaar/label

Browse source 
Label: add auto_height
This commit is contained in:
Rémi Verschelde 2017-07-24 23:05:05 +02:00 committed by GitHub
commit bf8119f966
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/gui/label.cpp
View file

@ -28,8 +28,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "label.h" #include "label.h"
#include "project_settings.h"
#include "print_string.h" #include "print_string.h"
#include "project_settings.h"
#include "translation.h" #include "translation.h"
void Label::set_autowrap(bool p_autowrap) { void Label::set_autowrap(bool p_autowrap) {
@ -292,7 +292,7 @@ void Label::_notification(int p_what) {
Size2 Label::get_minimum_size() const { Size2 Label::get_minimum_size() const {
if (autowrap) if (autowrap)
return Size2(1, 1); return Size2(1, clip ? 1 : minsize.height);
else { else {
// don't want to mutable everything // don't want to mutable everything
@ -487,14 +487,14 @@ void Label::regenerate_word_cache() {
} }
} }
if (!autowrap) { if (!autowrap)
minsize.width = width; minsize.width = width;
if (max_lines_visible > 0 && line_count > max_lines_visible) { if (max_lines_visible > 0 && line_count > max_lines_visible) {
minsize.height = (font->get_height() * max_lines_visible) + (line_spacing * (max_lines_visible - 1)); minsize.height = (font->get_height() * max_lines_visible) + (line_spacing * (max_lines_visible - 1));
} else { } else {
minsize.height = (font->get_height() * line_count) + (line_spacing * (line_count - 1)); minsize.height = (font->get_height() * line_count) + (line_spacing * (line_count - 1));
} }
}
word_cache_dirty = false; word_cache_dirty = false;
} }