Merge pull request #1042 from reupen/filter-prefs-fields-font-bug

Fix Filter field list in preferences not showing text on second access
reupen · Dec 21, 2024 · cf58ebb · cf58ebb
2 parents df6ebd7 + ef902aa
commit cf58ebb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,8 @@
   [#1030](https://github.com/reupen/columns_ui/pull/1030),
   [#1031](https://github.com/reupen/columns_ui/pull/1031),
   [#1037](https://github.com/reupen/columns_ui/pull/1037),
-  [#1039](https://github.com/reupen/columns_ui/pull/1039)]
+  [#1039](https://github.com/reupen/columns_ui/pull/1039),
+  [#1042](https://github.com/reupen/columns_ui/pull/1042)]
 
   This includes colour font support on Windows 8.1 and newer (allowing the use
   of, for example, colour emojis).

diff --git a/foo_ui_columns/config_columns_v2.cpp b/foo_ui_columns/config_columns_v2.cpp
@@ -576,12 +576,11 @@ INT_PTR TabColumns::on_message(HWND wnd, UINT msg, WPARAM wp, LPARAM lp)
     switch (msg) {
     case WM_INITDIALOG: {
         m_wnd = wnd;
-        // if (g_main_window && !cfg_nohscroll ) playlist_view::g_save_columns();
-        m_columns_list_view.create(wnd, {7, 30, 79, 215}, true);
 
         LOGFONT font{};
         GetObject(GetWindowFont(wnd), sizeof(font), &font);
         m_columns_list_view.set_font_from_log_font(font);
+        m_columns_list_view.create(wnd, {7, 30, 79, 215}, true);
 
         m_columns.set_entries_copy(g_columns, true);
 

diff --git a/foo_ui_columns/config_filter.cpp b/foo_ui_columns/config_filter.cpp
@@ -107,6 +107,9 @@ static class TabFilterFields : public PreferencesTab {
         switch (msg) {
         case WM_INITDIALOG: {
             {
+                LOGFONT font{};
+                GetObject(GetWindowFont(wnd), sizeof(font), &font);
+                m_field_list.set_font_from_log_font(font);
                 HWND wnd_fields = m_field_list.create(wnd, uih::WindowPosition(7, 30, 313, 213), true);
                 SetWindowPos(wnd_fields, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
                 ShowWindow(wnd_fields, SW_SHOWNORMAL);

diff --git a/foo_ui_columns/foo_ui_columns.rc b/foo_ui_columns/foo_ui_columns.rc
@@ -388,9 +388,9 @@ BEGIN
 END
 
 IDD_PREFS_FILTER_FIELDS DIALOGEX 0, 0, 327, 271
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
+FONT 8, "Tahoma", 400, 0, 0x0
 BEGIN
     LTEXT           "Fields",IDC_TITLE1,7,4,313,16
     PUSHBUTTON      "New",IDC_NEW,7,250,50,14

diff --git a/ui_helpers b/ui_helpers