diff options
| author | sapier <Sapier at GMX dot net> | 2015-01-06 16:01:49 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2015-01-06 16:13:39 +0100 |
| commit | 083d19b3fc8f60468e124c801296c13b66c41abc (patch) | |
| tree | c1e2a9fd7e54dad102da6a8aada8d3b1a476fbbd /src/guiFormSpecMenu.cpp | |
| parent | ef0a4e361440430e9512c7adc278c36956275a5c (diff) | |
| download | minetest-083d19b3fc8f60468e124c801296c13b66c41abc.tar.gz minetest-083d19b3fc8f60468e124c801296c13b66c41abc.tar.bz2 minetest-083d19b3fc8f60468e124c801296c13b66c41abc.zip | |
Fixes for android
Copy only minetest_game to apk by default
Don't copy .git and .svn folders to apk
Fix bouncing asset copy scrollbar due to long filepaths
Reenable font scaling to fix broken menu on high dpi screens
Implement minetest loglevel to android loglevel mapping
Disable touch digging while moving around
Diffstat (limited to 'src/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 35a0380ba..80afe594a 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -76,21 +76,6 @@ 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 @@ -120,7 +105,6 @@ 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, |