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

FIX: WindowDialog title translation 

(cherry picked from commit efc8314516)
This commit is contained in:
ternvein 2019-09-30 13:07:47 +04:00 committed by Rémi Verschelde
parent f915d69e05
commit 605dbffe93
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/dialogs.cpp
View File

@ -205,9 +205,9 @@ void WindowDialog::_notification(int p_what) {
Color title_color = get_color("title_color", "WindowDialog"); Color title_color = get_color("title_color", "WindowDialog");
int title_height = get_constant("title_height", "WindowDialog"); int title_height = get_constant("title_height", "WindowDialog");
int font_height = title_font->get_height() - title_font->get_descent() * 2; int font_height = title_font->get_height() - title_font->get_descent() * 2;
int x = (size.x - title_font->get_string_size(title).x) / 2; int x = (size.x - title_font->get_string_size(xl_title).x) / 2;
int y = (-title_height + font_height) / 2; int y = (-title_height + font_height) / 2;
title_font->draw(canvas, Point2(x, y), title, title_color, size.x - panel->get_minimum_size().x); title_font->draw(canvas, Point2(x, y), xl_title, title_color, size.x - panel->get_minimum_size().x);
} break; } break;
case NOTIFICATION_THEME_CHANGED: case NOTIFICATION_THEME_CHANGED:
@ -221,8 +221,9 @@ void WindowDialog::_notification(int p_what) {
case NOTIFICATION_TRANSLATION_CHANGED: { case NOTIFICATION_TRANSLATION_CHANGED: {
String new_title = tr(title); String new_title = tr(title);
if (title != new_title) { if (new_title != xl_title) {
title = new_title; xl_title = new_title;
minimum_size_changed();
update(); update();
} }
} break; } break;
@ -282,9 +283,10 @@ int WindowDialog::_drag_hit_test(const Point2 &pos) const {
void WindowDialog::set_title(const String &p_title) { void WindowDialog::set_title(const String &p_title) {
String new_title = tr(p_title); if (title != p_title) {
if (title != new_title) { title = p_title;
title = new_title; xl_title = tr(p_title);
minimum_size_changed();
update(); update();
} }
} }
@ -305,7 +307,7 @@ Size2 WindowDialog::get_minimum_size() const {
Ref<Font> font = get_font("title_font", "WindowDialog"); Ref<Font> font = get_font("title_font", "WindowDialog");
const int button_width = close_button->get_combined_minimum_size().x; const int button_width = close_button->get_combined_minimum_size().x;
const int title_width = font->get_string_size(title).x; const int title_width = font->get_string_size(xl_title).x;
const int padding = button_width / 2; const int padding = button_width / 2;
const int button_area = button_width + padding; const int button_area = button_width + padding;

1
scene/gui/dialogs.h
View File

@ -56,6 +56,7 @@ class WindowDialog : public Popup {
TextureButton *close_button; TextureButton *close_button;
String title; String title;
String xl_title;
int drag_type; int drag_type;
Point2 drag_offset; Point2 drag_offset;
Point2 drag_offset_far; Point2 drag_offset_far;