From: Toni Wilen <twilen@winuae.net>
Date: Sat, 3 Jun 2017 18:06:12 +0000 (+0300)
Subject: Always set listview font. Make sure single column lists are always full width.
X-Git-Tag: 3500~16
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=38e627014ae10cae5949b248dbe4706fada16235;p=francis%2Fwinuae.git

Always set listview font. Make sure single column lists are always full width.
---

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index d4a32db7..96a815a6 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -4860,6 +4860,8 @@ void InitializeListView (HWND hDlg)
 			if (listview_num_columns == 2) {
 				if ((temp = rect.right - rect.left - listview_column_width[0] - 30) > listview_column_width[1])
 					listview_column_width[1] = temp;
+			} else if (listview_num_columns == 1) {
+				listview_column_width[0] = rect.right - rect.left - 30;
 			}
 		}
 		// Adjust our column widths so that we can see the contents...
diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp
index 6fc81d92..51786f43 100644
--- a/od-win32/win32gui_extra.cpp
+++ b/od-win32/win32gui_extra.cpp
@@ -341,11 +341,13 @@ void scalaresource_listview_font_info(int *w)
 
 void scaleresource_setfont (HWND hDlg)
 {
-	if (!listviewcnt || (!_tcscmp (fontname_gui, fontname_list) && fontsize_gui == fontsize_list && fontstyle_gui == fontstyle_list && fontweight_gui == fontweight_list))
-		return;
-	openfont (false);
-	if (!listviewfont)
+	if (!listviewcnt)
 		return;
+	if (!listviewfont) {
+		openfont (false);
+		if (!listviewfont)
+			return;
+	}
 	for (int i = 0; i < listviewcnt; i++) {
 		SendMessage (GetDlgItem (hDlg, listviews[i]), WM_SETFONT, WPARAM(listviewfont), FALSE);
 	}