summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2015-03-29 23:21:08 -0400
committerSimon Howard2015-03-29 23:21:08 -0400
commit833d8a838b44a950ebde587db1d888bf0a98e690 (patch)
treea950f2b2073db982d3e3630ad46ffd68d1d9b5e0
parent29a66d7a5cf87d0cfc288e15833ddc1e3f8c0e5c (diff)
downloadchocolate-doom-833d8a838b44a950ebde587db1d888bf0a98e690.tar.gz
chocolate-doom-833d8a838b44a950ebde587db1d888bf0a98e690.tar.bz2
chocolate-doom-833d8a838b44a950ebde587db1d888bf0a98e690.zip
textscreen: Remove screen size-based font selection.
This was removed on Windows a while back in favour of a more conservative approach that examined the system DPI settings, but the logic still remained for other systems and it really isn't a good idea. Remove the logic that chooses a large font on large monitors, and add a TODO comment to add proper Linux font selection in the future, based on the Gtk+ HiDPI setting.
-rw-r--r--textscreen/txt_sdl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c
index 5576a151..5399c088 100644
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -218,12 +218,12 @@ static void ChooseFont(void)
{
font = &large_font;
}
-#else
- else if (info->current_w >= 1920 && info->current_h >= 1080)
- {
- font = &large_font;
- }
#endif
+ // TODO: Detect high DPI on Linux by inquiring about Gtk+ scale
+ // settings. This looks like it should just be a case of shelling
+ // out to invoke the 'gsettings' command, eg.
+ // gsettings get org.gnome.desktop.interface text-scaling-factor
+ // and using large_font if the result is >= 2.
else
{
font = &main_font;