gui1: Use a new font measurement for buttons to match GUI2

wesnoth · Mar 19, 2021 · 6a257b6 · 6a257b6
1 parent b157d8b
commit 6a257b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/font/constants.cpp b/src/font/constants.cpp
@@ -21,6 +21,7 @@ const int SIZE_NORMAL = 17;
 const int
 	SIZE_TINY = 13 * (SIZE_NORMAL / 17),
 	SIZE_SMALL = 15 * (SIZE_NORMAL / 17),
+	SIZE_BUTTON = 16 * (SIZE_NORMAL / 17),
 
 	SIZE_15 = 15 * (SIZE_NORMAL / 17),
 	SIZE_PLUS = 18 * (SIZE_NORMAL / 17),

diff --git a/src/font/constants.hpp b/src/font/constants.hpp
@@ -21,7 +21,7 @@ namespace font {
 // font sizes, to be made theme parameters
 extern const int SIZE_NORMAL;
 // automatic computation of other font sizes, to be made a default for theme-provided values
-extern const int SIZE_TINY, SIZE_SMALL,
+extern const int SIZE_TINY, SIZE_SMALL, SIZE_BUTTON,
 	SIZE_15, SIZE_PLUS, SIZE_LARGE, SIZE_TITLE, SIZE_XLARGE;
 
 // For arbitrary scaling:

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
@@ -36,7 +36,7 @@ static lg::log_domain log_display("display");
 
 namespace gui {
 
-const int font_size = font::SIZE_NORMAL;
+const int font_size = font::SIZE_BUTTON;
 const int horizontal_padding = font::SIZE_SMALL;
 const int checkbox_horizontal_padding = font::SIZE_SMALL / 2;
 const int vertical_padding = font::SIZE_SMALL / 2;