godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Button text when overrun is not trim nothing 

(cherry picked from commit 7f70ac56a0)
This commit is contained in:
Haoyu Qiu 2023-08-08 14:57:42 +08:00 committed by Yuri Sizov
parent 102f93b8b8
commit de5a7b3764
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/button.cpp
View File

@ -119,6 +119,7 @@ void Button::_notification(int p_what) {
Ref<StyleBox> style = theme_cache.normal; Ref<StyleBox> style = theme_cache.normal;
bool rtl = is_layout_rtl(); bool rtl = is_layout_rtl();
const bool is_clipped = clip_text || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING;
switch (get_draw_mode()) { switch (get_draw_mode()) {
case DRAW_NORMAL: { case DRAW_NORMAL: {
@ -284,7 +285,7 @@ void Button::_notification(int p_what) {
Size2 _size = get_size() - style->get_offset() * 2; Size2 _size = get_size() - style->get_offset() * 2;
int icon_text_separation = text.is_empty() ? 0 : theme_cache.h_separation; int icon_text_separation = text.is_empty() ? 0 : theme_cache.h_separation;
_size.width -= icon_text_separation + icon_ofs_region; _size.width -= icon_text_separation + icon_ofs_region;
if (!clip_text && icon_align_rtl_checked != HORIZONTAL_ALIGNMENT_CENTER) { if (!is_clipped && icon_align_rtl_checked != HORIZONTAL_ALIGNMENT_CENTER) {
_size.width -= text_buf->get_size().width; _size.width -= text_buf->get_size().width;
} }
if (vertical_icon_alignment != VERTICAL_ALIGNMENT_CENTER) { if (vertical_icon_alignment != VERTICAL_ALIGNMENT_CENTER) {
@ -336,9 +337,9 @@ void Button::_notification(int p_what) {
text_clip -= _internal_margin[SIDE_RIGHT] + theme_cache.h_separation; text_clip -= _internal_margin[SIDE_RIGHT] + theme_cache.h_separation;
} }
text_buf->set_width((clip_text || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) ? text_clip : -1); text_buf->set_width(is_clipped ? text_clip : -1);
int text_width = MAX(1, (clip_text || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) ? MIN(text_clip, text_buf->get_size().x) : text_buf->get_size().x); int text_width = MAX(1, is_clipped ? MIN(text_clip, text_buf->get_size().x) : text_buf->get_size().x);
Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - text_buf->get_size() - Point2(_internal_margin[SIDE_RIGHT] - _internal_margin[SIDE_LEFT], 0)) / 2.0; Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - text_buf->get_size() - Point2(_internal_margin[SIDE_RIGHT] - _internal_margin[SIDE_LEFT], 0)) / 2.0;