From f7f7fec497f83da0d9f6ea2e83796720484033ff Mon Sep 17 00:00:00 2001
From: Craig Robbins <kde.psych@gmail.com>
Date: Fri, 5 Dec 2014 01:42:03 +1000
Subject: [PATCH] (INTERIM) Make sizes of the font in formspecs consistent and
not so large
Until a permanent fix can be developed
---
src/constants.h | 2 +-
src/guiFormSpecMenu.cpp | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/constants.h b/src/constants.h
index 8e39ccb74..2da4a34e5 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -98,7 +98,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
* GUI related things
*/
#define LEGACY_SCALING (2./3.)
-#define TTF_DEFAULT_FONT_SIZE (13.0 / LEGACY_SCALING)
+#define TTF_DEFAULT_FONT_SIZE (12.0 / LEGACY_SCALING)
#define DEFAULT_FONT_SIZE (14)
#endif
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 883228820..d3c2a0b88 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -76,6 +76,21 @@ static unsigned int font_line_height(gui::IGUIFont *font)
static gui::IGUIFont *select_font_by_line_height(double target_line_height)
{
+ return g_fontengine->getFont();
+
+/* I have no idea what this is trying to achieve, but scaling the font according
+ * to the size of a formspec/dialog does not seem to be a standard (G)UI
+ * design and AFAIK no existing nor proposed GUI does this. Besides that it:
+ * a) breaks most (current) formspec layouts
+ * b) font sizes change depending on the size of the formspec/dialog (see above)
+ * meaning that there is no UI consistency
+ * c) the chosen fonts are, in general, probably too large
+ *
+ * Disabling for now.
+ *
+ * FIXME
+ */
+#if 0
// We don't get to directly select a font according to its
// baseline-to-baseline height. Rather, we select by em size.
// The ratio between these varies between fonts. The font
@@ -105,6 +120,7 @@ static gui::IGUIFont *select_font_by_line_height(double target_line_height)
}
}
return g_fontengine->getFont(target_line_height - lohgt < hihgt - target_line_height ? loreq : hireq);
+#endif
}
GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
--
GitLab