From 38e627014ae10cae5949b248dbe4706fada16235 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 3 Jun 2017 21:06:12 +0300 Subject: [PATCH] Always set listview font. Make sure single column lists are always full width. --- od-win32/win32gui.cpp | 2 ++ od-win32/win32gui_extra.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) 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); } -- 2.47.3