mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 08:28:36 +02:00
(INTERIM) Make sizes of the font in formspecs consistent and not so large
Until a permanent fix can be developed
This commit is contained in:
parent
c16b1e2639
commit
f7f7fec497
@ -98,7 +98,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
* GUI related things
|
* GUI related things
|
||||||
*/
|
*/
|
||||||
#define LEGACY_SCALING (2./3.)
|
#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)
|
#define DEFAULT_FONT_SIZE (14)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -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)
|
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
|
// We don't get to directly select a font according to its
|
||||||
// baseline-to-baseline height. Rather, we select by em size.
|
// baseline-to-baseline height. Rather, we select by em size.
|
||||||
// The ratio between these varies between fonts. The font
|
// 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);
|
return g_fontengine->getFont(target_line_height - lohgt < hihgt - target_line_height ? loreq : hireq);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
|
GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
|
||||||
|
Loading…
Reference in New Issue
Block a user