From 7e33df30786dc3ef300a29d3b560aa8fd624e8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?= Date: Thu, 23 Sep 2021 00:27:09 +0900 Subject: [PATCH] ADD: Macro constant to fit button width to text --- gui/gui_theme.h | 1 + gui/kennfarbe.cc | 2 +- gui/savegame_frame.cc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gui/gui_theme.h b/gui/gui_theme.h index 1017ebcb39..2a9cb15651 100644 --- a/gui/gui_theme.h +++ b/gui/gui_theme.h @@ -28,6 +28,7 @@ class image_t; #define D_BUTTON_SIZE (gui_theme_t::gui_button_size ) #define D_BUTTON_WIDTH (gui_theme_t::gui_button_size.w) #define D_BUTTON_HEIGHT (gui_theme_t::gui_button_size.h) +#define D_BUTTON_PADDINGS_X (gui_theme_t::gui_button_text_offset.w + gui_theme_t::gui_button_text_offset_right.x) #define D_FILTER_BUTTON_SIZE (gui_theme_t::gui_color_button_size ) #define D_FILTER_BUTTON_WIDTH (gui_theme_t::gui_color_button_size.w) diff --git a/gui/kennfarbe.cc b/gui/kennfarbe.cc index b10ada6ac4..aa2566f24e 100644 --- a/gui/kennfarbe.cc +++ b/gui/kennfarbe.cc @@ -22,7 +22,7 @@ class choose_color_button_t : public button_t public: choose_color_button_t() : button_t() { - w = max(D_BUTTON_HEIGHT, display_get_char_width('X') + gui_theme_t::gui_button_text_offset.w + gui_theme_t::gui_button_text_offset_right.x); + w = max(D_BUTTON_HEIGHT, display_get_char_width('X') + D_BUTTON_PADDINGS_X); } scr_size get_min_size() const OVERRIDE { diff --git a/gui/savegame_frame.cc b/gui/savegame_frame.cc index c5701983eb..4a86a33a1f 100644 --- a/gui/savegame_frame.cc +++ b/gui/savegame_frame.cc @@ -30,7 +30,7 @@ class del_button_t : public button_t del_button_t() : button_t() { init(button_t::roundbox, "X"); - w = max(D_BUTTON_HEIGHT, display_get_char_width('X') + gui_theme_t::gui_button_text_offset.w + gui_theme_t::gui_button_text_offset_right.x); + w = max(D_BUTTON_HEIGHT, display_get_char_width('X') + D_BUTTON_PADDINGS_X); } scr_size get_min_size() const OVERRIDE {