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 d4a32db79312d45b9b0aacf8cdb8aeae40fd7810..96a815a6dc5627e8fcff204ea80ac4abf02e6d77 100644 (file)
--- 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 6fc81d92b61ad3fdd02a57b0e11c8d542ed20f23..51786f4367184a7a881e13f4a9e9910cd499f403 100644 (file)
--- 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);
        }