change default font to Segoe UI (#1323)

Author: Jamiras

src/RA_Resource.h

@@ -154,6 +154,7 @@
 #define IDC_RA_ADD_REGION               1249
 #define IDC_RA_REMOVE_REGION            1250
 #define IDC_RA_VIEW_DETAIL              1251
+#define IDC_RA_LBL_VALUE                1252
 
 
 #define IDD_RA_MEMORY                   1501
@@ -226,7 +227,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        122
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1252
+#define _APS_NEXT_CONTROL_VALUE         1253
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

src/RA_Shared.rc

@@ -32,23 +32,14 @@ namespace ui {
 namespace win32 {
 
 static constexpr int COLUMN_WIDTH_ID = 30;
-static constexpr int COLUMN_WIDTH_FLAG = 78;
-static constexpr int COLUMN_WIDTH_TYPE = 42;
-static constexpr int COLUMN_WIDTH_SIZE = 72;
-static constexpr int COLUMN_WIDTH_VALUE = 72;
-static constexpr int COLUMN_WIDTH_OPERATOR = 35;
+static constexpr int COLUMN_WIDTH_FLAG = 110;
+static constexpr int COLUMN_WIDTH_TYPE = 60;
+static constexpr int COLUMN_WIDTH_SIZE = 90;
+static constexpr int COLUMN_WIDTH_VALUE = 90;
+static constexpr int COLUMN_WIDTH_OPERATOR = 38;
 static constexpr int COLUMN_WIDTH_HITS = 84;
 
 using fnGetStockIconInfo = std::add_pointer_t<HRESULT WINAPI(SHSTOCKICONID, UINT, SHSTOCKICONINFO*)>;
-static fnGetStockIconInfo pGetStockIconInfo = nullptr;
-
-AssetEditorDialog::Presenter::Presenter() noexcept
-{
-    // SHGetStockIconInfo isn't supported on WinXP, so we have to dynamically find it.
-    auto hDll = LoadLibraryA("Shell32");
-    if (hDll)
-        GSL_SUPPRESS_TYPE1 pGetStockIconInfo = reinterpret_cast<fnGetStockIconInfo>(GetProcAddress(hDll, "SHGetStockIconInfo"));
-}
 
 bool AssetEditorDialog::Presenter::IsSupported(const ra::ui::WindowViewModelBase& vmViewModel) noexcept
 {
@@ -667,23 +658,14 @@ void AssetEditorDialog::ErrorIconBinding::OnViewModelBoolValueChanged(const Bool
         UpdateImage();
 }
 
-static HICON GetIcon(SHSTOCKICONID nStockIconId, LPCWSTR nOicIconId) noexcept
+static HICON GetIcon(SHSTOCKICONID nStockIconId, LPCWSTR) noexcept
 {
-    if (pGetStockIconInfo != nullptr)
-    {
-        SHSTOCKICONINFO sii{};
-        sii.cbSize = sizeof(sii);
-        if (SUCCEEDED(pGetStockIconInfo(nStockIconId, SHGSI_ICON | SHGSI_SMALLICON, &sii)))
-            return sii.hIcon;
+    SHSTOCKICONINFO sii{};
+    sii.cbSize = sizeof(sii);
+    if (SUCCEEDED(SHGetStockIconInfo(nStockIconId, SHGSI_ICON | SHGSI_SMALLICON, &sii)))
+        return sii.hIcon;
 
-        return nullptr;
-    }
-
-    // despite requesting a 16x16 icon, this returns a 32x32 one, which looks awkward in the space
-    // provided. GetStockIconInfo is prefered because it returns an appropriately sized icon. this
-    // is fallback logic for WinXP.
-    GSL_SUPPRESS_TYPE1
-    return reinterpret_cast<HICON>(LoadImage(nullptr, nOicIconId, IMAGE_ICON, 16, 16, LR_SHARED));
+    return nullptr;
 }
 
 void AssetEditorDialog::ErrorIconBinding::SetErrorIcon() noexcept
@@ -874,6 +856,7 @@ AssetEditorDialog::AssetEditorDialog(AssetEditorViewModel& vmAssetEditor)
     m_bindAchievementTypes.BindSelectedItem(AssetEditorViewModel::AchievementTypeProperty);
     m_bindWindow.BindVisible(IDC_RA_LBL_TYPE, AssetEditorViewModel::IsAchievementProperty);
     m_bindWindow.BindVisible(IDC_RA_TYPE, AssetEditorViewModel::IsAchievementProperty);
+    m_bindWindow.BindVisible(IDC_RA_LBL_MEASURED, AssetEditorViewModel::IsAchievementProperty);
 
     // leaderboard only fields
     m_bindFormats.BindItems(vmAssetEditor.Formats());
@@ -883,6 +866,7 @@ AssetEditorDialog::AssetEditorDialog(AssetEditorViewModel& vmAssetEditor)
     m_bindWindow.BindVisible(IDC_RA_LBL_FORMAT, AssetEditorViewModel::IsLeaderboardProperty);
     m_bindWindow.BindVisible(IDC_RA_FORMAT, AssetEditorViewModel::IsLeaderboardProperty);
     m_bindWindow.BindVisible(IDC_RA_CHK_LOWER_IS_BETTER, AssetEditorViewModel::IsLeaderboardProperty);
+    m_bindWindow.BindVisible(IDC_RA_LBL_VALUE, AssetEditorViewModel::IsLeaderboardProperty);
     m_bindWindow.BindVisible(IDC_RA_LBL_DISPLAY, AssetEditorViewModel::IsLeaderboardProperty);
     m_bindWindow.BindVisible(IDC_RA_DISPLAY, AssetEditorViewModel::IsLeaderboardProperty);
     m_bindWindow.BindVisible(IDC_RA_LBX_LBOARD_PARTS, AssetEditorViewModel::IsLeaderboardProperty);
@@ -1003,15 +987,16 @@ AssetEditorDialog::AssetEditorDialog(AssetEditorViewModel& vmAssetEditor)
     SetAnchor(IDC_RA_ID, Anchor::Top | Anchor::Right);
     SetAnchor(IDC_RA_CHK_ACTIVE, Anchor::Top | Anchor::Right);
     SetAnchor(IDC_RA_DESCRIPTION, Anchor::Top | Anchor::Left | Anchor::Right);
-    SetAnchor(IDC_RA_LBL_TYPE, Anchor::Top | Anchor::Right);
-    SetAnchor(IDC_RA_TYPE, Anchor::Top | Anchor::Right);
+    SetAnchor(IDC_RA_LBL_TYPE, Anchor::Top | Anchor::Left);
+    SetAnchor(IDC_RA_TYPE, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_LBL_POINTS, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_POINTS, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_LBL_FORMAT, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_FORMAT, Anchor::Top | Anchor::Left);
-    SetAnchor(IDC_RA_LBL_DISPLAY, Anchor::Top | Anchor::Left);
-    SetAnchor(IDC_RA_DISPLAY, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_CHK_LOWER_IS_BETTER, Anchor::Top | Anchor::Left);
+    SetAnchor(IDC_RA_LBL_DISPLAY, Anchor::Top | Anchor::Right);
+    SetAnchor(IDC_RA_DISPLAY, Anchor::Top | Anchor::Right);
+    SetAnchor(IDC_RA_LBL_VALUE, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_LBL_MEASURED, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_MEASURED, Anchor::Top | Anchor::Left);
     SetAnchor(IDC_RA_CHK_AS_PERCENT, Anchor::Top | Anchor::Left);
@@ -1039,7 +1024,7 @@ AssetEditorDialog::AssetEditorDialog(AssetEditorViewModel& vmAssetEditor)
     SetAnchor(IDC_RA_MOVE_COND_DOWN, Anchor::Bottom | Anchor::Left);
     SetAnchor(IDC_RA_CHK_SHOW_DECIMALS, Anchor::Bottom | Anchor::Right);
 
-    SetMinimumSize(665, 348);
+    SetMinimumSize(840, 348);
 }
 
 BOOL AssetEditorDialog::OnInitDialog()
@@ -1068,6 +1053,8 @@ BOOL AssetEditorDialog::OnInitDialog()
     m_bindActive.SetControl(*this, IDC_RA_CHK_ACTIVE);
     m_bindDecimalPreferred.SetControl(*this, IDC_RA_CHK_SHOW_DECIMALS);
 
+    SetFixedWidthFont(IDC_RA_LBX_CONDITIONS);
+
     m_hTooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, nullptr,
         WS_POPUP | TTS_ALWAYSTIP | TTS_NOPREFIX,
         CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,

src/ui/win32/AssetEditorDialog.cpp

@@ -32,8 +32,6 @@ public:
     class Presenter : public IClosableDialogPresenter
     {
     public:
-        Presenter() noexcept;
-
         bool IsSupported(const ra::ui::WindowViewModelBase& viewModel) noexcept override;
         void ShowWindow(ra::ui::WindowViewModelBase& viewModel) override;
         void ShowModal(ra::ui::WindowViewModelBase& viewModel, HWND hParentWnd) override;

src/ui/win32/AssetEditorDialog.hh

@@ -246,7 +246,7 @@ AssetListDialog::AssetListDialog(AssetListViewModel& vmAssetList)
     auto pChangesColumn = std::make_unique<ChangesColumnBinding>(
         AssetModelBase::ChangesProperty, vmAssetList.Changes());
     pChangesColumn->SetHeader(L"Changes");
-    pChangesColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 82);
+    pChangesColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 92);
     m_bindAssets.BindColumn(5 + nOffset, std::move(pChangesColumn));
 
     m_bindAssets.SetDoubleClickHandler([this](gsl::index nIndex)

src/ui/win32/AssetListDialog.cpp

@@ -62,7 +62,7 @@ BrokenAchievementsDialog::BrokenAchievementsDialog(BrokenAchievementsViewModel&
     auto pAchievedColumn = std::make_unique<ra::ui::win32::bindings::GridBooleanColumnBinding>(
         BrokenAchievementsViewModel::BrokenAchievementViewModel::IsAchievedProperty, L"Yes", L"No");
     pAchievedColumn->SetHeader(L"Achieved");
-    pAchievedColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 60);
+    pAchievedColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 64);
     m_bindAchievements.BindColumn(3, std::move(pAchievedColumn));
 
     m_bindAchievements.BindItems(vmBrokenAchievements.Achievements());

src/ui/win32/BrokenAchievementsDialog.cpp

@@ -692,6 +692,47 @@ void DialogBase::UpdateAnchoredControls()
     }
 }
 
+class FixedWidthFontHolder
+{
+public:
+    FixedWidthFontHolder()
+    {
+        m_hFont = CreateFontW(
+            15,                      // cHeight
+            0,                       // cWidth (0 lets font mapper choose best average width)
+            0,                       // cEscapement (0 for normal text)
+            0,                       // cOrientation (0 for normal text)
+            FW_NORMAL,               // cWeight
+            FALSE,                   // bItalic
+            FALSE,                   // bUnderline
+            FALSE,                   // bStrikeOut
+            ANSI_CHARSET,            // iCharSet
+            OUT_DEFAULT_PRECIS,      // iOutPrecision
+            CLIP_DEFAULT_PRECIS,     // iClipPrecision
+            DEFAULT_QUALITY,         // iQuality
+            FIXED_PITCH | FF_MODERN, // iPitchAndFamily (Forces fixed-width)
+            L"Consolas"              // pszFaceName
+        );
+    }
+
+    ~FixedWidthFontHolder()
+    {
+        DeleteObject(m_hFont);
+    }
+
+    HFONT GetFont() const noexcept { return m_hFont; }
+
+private:
+    HFONT m_hFont;
+};
+
+static FixedWidthFontHolder s_pFixedWidthFont;
+
+void DialogBase::SetFixedWidthFont(int nIDDlgItem) const noexcept
+{
+    SetWindowFont(GetDlgItem(GetHWND(), nIDDlgItem), s_pFixedWidthFont.GetFont(), TRUE);
+}
+
 } // namespace win32
 } // namespace ui
 } // namespace ra

src/ui/win32/DialogBase.cpp

@@ -152,6 +152,8 @@ protected:
         m_oMinimumSize.Height = nMinimumHeight;
     }
 
+    void SetFixedWidthFont(int nIDDlgItem) const noexcept;
+
 private:
     HWND m_hWnd = nullptr;
     IDialogPresenter* m_pDialogPresenter = nullptr; // nullable reference, not allocated

src/ui/win32/DialogBase.hh

@@ -148,15 +148,15 @@ MemoryBookmarksDialog::MemoryBookmarksDialog(MemoryBookmarksViewModel& vmMemoryB
     auto pSizeColumn = std::make_unique<ra::ui::win32::bindings::GridLookupColumnBinding>(
         MemoryBookmarksViewModel::MemoryBookmarkViewModel::SizeProperty, vmMemoryBookmarks.Bookmarks().Sizes());
     pSizeColumn->SetHeader(L"Size");
-    pSizeColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 76);
+    pSizeColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 90);
     pSizeColumn->SetAlignment(ra::ui::RelativePosition::Far);
     pSizeColumn->SetReadOnly(false);
     m_bindBookmarks.BindColumn(2, std::move(pSizeColumn));
 
     auto pFormatColumn = std::make_unique<ra::ui::win32::bindings::GridMemoryWatchFormatColumnBinding>(
         MemoryBookmarksViewModel::MemoryBookmarkViewModel::FormatProperty, vmMemoryBookmarks.Bookmarks().Formats());
     pFormatColumn->SetHeader(L"Format");
-    pFormatColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 32);
+    pFormatColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 34);
     pFormatColumn->SetReadOnly(false);
     m_bindBookmarks.BindColumn(3, std::move(pFormatColumn));
 
@@ -178,7 +178,7 @@ MemoryBookmarksDialog::MemoryBookmarksDialog(MemoryBookmarksViewModel& vmMemoryB
     auto pChangesColumn = std::make_unique<ra::ui::win32::bindings::GridNumberColumnBinding>(
         MemoryBookmarksViewModel::MemoryBookmarkViewModel::ChangesProperty);
     pChangesColumn->SetHeader(L"Changes");
-    pChangesColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 56);
+    pChangesColumn->SetWidth(GridColumnBinding::WidthType::Pixels, 58);
     pChangesColumn->SetAlignment(ra::ui::RelativePosition::Far);
     m_bindBookmarks.BindColumn(6, std::move(pChangesColumn));
 
@@ -210,6 +210,8 @@ BOOL MemoryBookmarksDialog::OnInitDialog()
     m_bindBookmarks.SetControl(*this, IDC_RA_LBX_ADDRESSES);
     m_bindBookmarks.InitializeTooltips(std::chrono::seconds(30));
 
+    SetFixedWidthFont(IDC_RA_LBX_ADDRESSES);
+
     return DialogBase::OnInitDialog();
 }
 

src/ui/win32/MemoryBookmarksDialog.cpp

@@ -88,7 +88,7 @@ void MemoryInspectorDialog::SearchResultsGridBinding::UpdateColumnWidths()
     int nWidth = 0;
     const auto& vmMemory = GetViewModel<MemorySearchViewModel>();
     const auto nSize = vmMemory.ResultMemSize();
-    constexpr int nCharWidth = 6;
+    constexpr int nCharWidth = 7;
     constexpr int nPadding = 6;
 
     // value column
@@ -198,13 +198,13 @@ MemoryInspectorDialog::MemoryInspectorDialog(MemoryInspectorViewModel& vmMemoryI
     auto pAddressColumn = std::make_unique<ra::ui::win32::bindings::GridTextColumnBinding>(
         MemorySearchViewModel::SearchResultViewModel::AddressProperty);
     pAddressColumn->SetHeader(L"Address");
-    pAddressColumn->SetWidth(ra::ui::win32::bindings::GridColumnBinding::WidthType::Pixels, 60);
+    pAddressColumn->SetWidth(ra::ui::win32::bindings::GridColumnBinding::WidthType::Pixels, 64);
     m_bindSearchResults.BindColumn(0, std::move(pAddressColumn));
 
     auto pValueColumn = std::make_unique<SearchResultValueColumnBinding>(
         MemorySearchViewModel::SearchResultViewModel::CurrentValueProperty);
     pValueColumn->SetHeader(L"Value");
-    pValueColumn->SetWidth(ra::ui::win32::bindings::GridColumnBinding::WidthType::Pixels, 50);
+    pValueColumn->SetWidth(ra::ui::win32::bindings::GridColumnBinding::WidthType::Pixels, 52);
     m_bindSearchResults.BindColumn(1, std::move(pValueColumn));
 
     auto pDescriptionColumn = std::make_unique<ra::ui::win32::bindings::GridTextColumnBinding>(
@@ -333,8 +333,12 @@ BOOL MemoryInspectorDialog::OnInitDialog()
     m_bindViewer32BitBE.SetControl(*this, IDC_RA_MEMVIEW_32BITBE);
     m_bindViewer.SetControl(*this, IDC_RA_MEMVIEWER);
 
-    SetWindowFont(GetDlgItem(GetHWND(), IDC_RA_MEMBITS), GetStockObject(SYSTEM_FIXED_FONT), TRUE);
-    SetWindowFont(GetDlgItem(GetHWND(), IDC_RA_MEMBITS_TITLE), GetStockObject(SYSTEM_FIXED_FONT), TRUE);
+    SetFixedWidthFont(IDC_RA_SEARCHRANGE);
+    SetFixedWidthFont(IDC_RA_ADDRESS);
+    SetFixedWidthFont(IDC_RA_NOTE_TEXT);
+    SetFixedWidthFont(IDC_RA_RESULTS);
+    SetFixedWidthFont(IDC_RA_MEMBITS);
+    SetFixedWidthFont(IDC_RA_MEMBITS_TITLE);
 
     // NOTE: This is the number of Unicode characters allowed. The database stores data
     //       in UTF-8, so this is the upper bound and less will actually be allowed if