1 files changed, 12 insertions, 2 deletions

diff --git a/windows.c b/windows.c
index 099ad502e..a4fe1e2c2 100644
--- a/windows.c
+++ b/windows.c
@@ -12,12 +12,22 @@
 #include <dirent.h>
 #include <zip.h>
 
-const char system_divelist_default_font[] = "Calibri";
-const int system_divelist_default_font_size = 8;
+const char non_standard_system_divelist_default_font[] = "Calibri";
+const char current_system_divelist_default_font[] = "Segoe UI";
+const char *system_divelist_default_font = non_standard_system_divelist_default_font;
+const int system_divelist_default_font_size = 9;
 
 void subsurface_user(struct user_info *user)
 { /* Encourage use of at least libgit2-0.20 */ }
 
+extern bool isWin7Or8();
+
+void subsurface_OS_pref_setup(void)
+{
+	if (isWin7Or8())
+		system_divelist_default_font = current_system_divelist_default_font;
+}
+
 const char *system_default_filename(void)
 {
 	char datapath[MAX_PATH];