BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix rounding error in font size making main menu and in game font sizes inconsistent

Browse Source
This commit is contained in:
sapier 2015-01-02 16:52:02 +01:00
parent 7452d5399b
commit aaec558f85
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/guiFormSpecMenu.cpp
View File

@ -1951,7 +1951,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
// wide, including border) just fit into the // wide, including border) just fit into the
// default window (800 pixels wide) at 96 DPI // default window (800 pixels wide) at 96 DPI
// and default scaling (1.00). // and default scaling (1.00).
use_imgsize = 0.53 * screen_dpi * gui_scaling; use_imgsize = 0.5555 * screen_dpi * gui_scaling;
} else { } else {
// In variable-size mode, we prefer to make the // In variable-size mode, we prefer to make the
// inventory image size 1/15 of screen height, // inventory image size 1/15 of screen height,
@ -1991,6 +1991,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
spacing = v2s32(use_imgsize*5.0/4, use_imgsize*15.0/13); spacing = v2s32(use_imgsize*5.0/4, use_imgsize*15.0/13);
padding = v2s32(use_imgsize*3.0/8, use_imgsize*3.0/8); padding = v2s32(use_imgsize*3.0/8, use_imgsize*3.0/8);
double target_font_height = use_imgsize*15.0/13 * 0.4; double target_font_height = use_imgsize*15.0/13 * 0.4;
target_font_height *= g_settings->getFloat("font_size")/TTF_DEFAULT_FONT_SIZE;
m_btn_height = use_imgsize*15.0/13 * 0.35; m_btn_height = use_imgsize*15.0/13 * 0.35;
m_font = select_font_by_line_height(target_font_height); m_font = select_font_by_line_height(target_font_height);