Unverified Commit a0dd3aba by Rémi Verschelde Committed by GitHub

Merge pull request #14716 from poke1024/fix_window_title

Fixes close button overlapping window title
parents e946fb8c 2616e2b3
......@@ -289,10 +289,17 @@ bool WindowDialog::get_resizable() const {
Size2 WindowDialog::get_minimum_size() const {
Ref<Font> font = get_font("title_font", "WindowDialog");
int msx = close_button->get_combined_minimum_size().x;
msx += font->get_string_size(title).x;
return Size2(msx, 1);
const int button_width = close_button->get_combined_minimum_size().x;
const int title_width = font->get_string_size(title).x;
const int padding = button_width / 2;
const int button_area = button_width + padding;
// as the title gets centered, title_width + close_button_width is not enough.
// we want a width w, such that w / 2 - title_width / 2 >= button_area, i.e.
// w >= 2 * button_area + title_width
return Size2(2 * button_area + title_width, 1);
}
TextureButton *WindowDialog::get_close_button() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment