Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for WindowDialog and Tabs controls translation #32440

Merged
merged 2 commits into from Oct 1, 2019
Merged

Fix for WindowDialog and Tabs controls translation #32440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc8314
FIX: WindowDialog title translation
Sep 30, 2019
118940e
FIX: Tabs text translation
Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions scene/gui/dialogs.cpp
View file
Open in desktop
Expand Up @@ -206,9 +206,9 @@ void WindowDialog::_notification(int p_what) {
Color title_color = get_color("title_color", "WindowDialog");
int title_height = get_constant("title_height", "WindowDialog");
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;
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;

case NOTIFICATION_THEME_CHANGED:
Expand All @@ -222,8 +222,9 @@ void WindowDialog::_notification(int p_what) {

case NOTIFICATION_TRANSLATION_CHANGED: {
String new_title = tr(title);
if (title != new_title) {
title = new_title;
if (new_title != xl_title) {
xl_title = new_title;
minimum_size_changed();
update();
}
} break;
Expand Down Expand Up @@ -283,9 +284,10 @@ int WindowDialog::_drag_hit_test(const Point2 &pos) const {

void WindowDialog::set_title(const String &p_title) {

String new_title = tr(p_title);
if (title != new_title) {
title = new_title;
if (title != p_title) {
title = p_title;
xl_title = tr(p_title);
minimum_size_changed();
update();
}
}
Expand All @@ -306,7 +308,7 @@ Size2 WindowDialog::get_minimum_size() const {
Ref<Font> font = get_font("title_font", "WindowDialog");

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 button_area = button_width + padding;

Expand Down
1 change: 1 addition & 0 deletions scene/gui/dialogs.h
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@ class WindowDialog : public Popup {

TextureButton *close_button;
String title;
String xl_title;
int drag_type;
Point2 drag_offset;
Point2 drag_offset_far;
Expand Down
15 changes: 10 additions & 5 deletions scene/gui/tabs.cpp
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ Size2 Tabs::get_minimum_size() const {
ms.width += get_constant("hseparation");
}

ms.width += Math::ceil(font->get_string_size(tabs[i].text).width);
ms.width += Math::ceil(font->get_string_size(tabs[i].xl_text).width);

if (tabs[i].disabled)
ms.width += tab_disabled->get_minimum_size().width;
Expand Down Expand Up @@ -223,6 +223,9 @@ void Tabs::_notification(int p_what) {
switch (p_what) {

case NOTIFICATION_TRANSLATION_CHANGED: {
for (int i = 0; i < tabs.size(); ++i) {
tabs.write[i].xl_text = tr(tabs[i].text);
}
minimum_size_changed();
update();
} break;
Expand Down Expand Up @@ -318,7 +321,7 @@ void Tabs::_notification(int p_what) {
w += icon->get_width() + get_constant("hseparation");
}

font->draw(ci, Point2i(w, sb->get_margin(MARGIN_TOP) + ((sb_rect.size.y - sb_ms.y) - font->get_height()) / 2 + font->get_ascent()), tabs[i].text, col, tabs[i].size_text);
font->draw(ci, Point2i(w, sb->get_margin(MARGIN_TOP) + ((sb_rect.size.y - sb_ms.y) - font->get_height()) / 2 + font->get_ascent()), tabs[i].xl_text, col, tabs[i].size_text);

w += tabs[i].size_text;

Expand Down Expand Up @@ -435,6 +438,7 @@ void Tabs::set_tab_title(int p_tab, const String &p_title) {

ERR_FAIL_INDEX(p_tab, tabs.size());
tabs.write[p_tab].text = p_title;
tabs.write[p_tab].xl_text = tr(p_title);
update();
minimum_size_changed();
}
Expand Down Expand Up @@ -543,7 +547,7 @@ void Tabs::_update_cache() {
for (int i = 0; i < tabs.size(); i++) {
tabs.write[i].ofs_cache = mw;
tabs.write[i].size_cache = get_tab_width(i);
tabs.write[i].size_text = Math::ceil(font->get_string_size(tabs[i].text).width);
tabs.write[i].size_text = Math::ceil(font->get_string_size(tabs[i].xl_text).width);
mw += tabs[i].size_cache;
if (tabs[i].size_cache <= min_width || i == current) {
size_fixed += tabs[i].size_cache;
Expand Down Expand Up @@ -604,6 +608,7 @@ void Tabs::add_tab(const String &p_str, const Ref<Texture> &p_icon) {

Tab t;
t.text = p_str;
t.xl_text = tr(p_str);
t.icon = p_icon;
t.disabled = false;
t.ofs_cache = 0;
Expand Down Expand Up @@ -659,7 +664,7 @@ Variant Tabs::get_drag_data(const Point2 &p_point) {
tf->set_texture(tabs[tab_over].icon);
drag_preview->add_child(tf);
}
Label *label = memnew(Label(tabs[tab_over].text));
Label *label = memnew(Label(tabs[tab_over].xl_text));
drag_preview->add_child(label);
if (!tabs[tab_over].right_button.is_null()) {
TextureRect *tf = memnew(TextureRect);
Expand Down Expand Up @@ -808,7 +813,7 @@ int Tabs::get_tab_width(int p_idx) const {
x += get_constant("hseparation");
}

x += Math::ceil(font->get_string_size(tabs[p_idx].text).width);
x += Math::ceil(font->get_string_size(tabs[p_idx].xl_text).width);

if (tabs[p_idx].disabled)
x += tab_disabled->get_minimum_size().width;
Expand Down
1 change: 1 addition & 0 deletions scene/gui/tabs.h
View file
Open in desktop
Expand Up @@ -58,6 +58,7 @@ class Tabs : public Control {
struct Tab {

String text;
String xl_text;
Ref<Texture> icon;
int ofs_cache;
bool disabled;
Expand Down