From bf760fcd2a7d97a7db8e8134158e477417faf4b4 Mon Sep 17 00:00:00 2001 From: lx-s Date: Wed, 24 Sep 2025 09:25:37 +0200 Subject: [PATCH] Added LogDialog Proc --- WinMute/AboutDlg.cpp | 13 +++------ WinMute/LogDialog.cpp | 62 +++++++------------------------------------ 2 files changed, 13 insertions(+), 62 deletions(-) diff --git a/WinMute/AboutDlg.cpp b/WinMute/AboutDlg.cpp index c4214bd..2236d6e 100644 --- a/WinMute/AboutDlg.cpp +++ b/WinMute/AboutDlg.cpp @@ -73,15 +73,10 @@ enum AboutTabsIDs { }; struct AboutDlgData { - HWND hTabCtrl; - std::array hTabs; - HWND hActiveTab; - HFONT hTitleFont; - - AboutDlgData() noexcept - : hTabCtrl{nullptr}, hTabs{nullptr}, hActiveTab{nullptr}, hTitleFont{nullptr} - { - } + HWND hTabCtrl = nullptr; + std::array hTabs{nullptr}; + HWND hActiveTab = nullptr; + HFONT hTitleFont = nullptr; }; static void InsertTabItem(HWND hTabCtrl, UINT id, const std::wstring& itemName) diff --git a/WinMute/LogDialog.cpp b/WinMute/LogDialog.cpp index 3a77cbf..14c1ca5 100644 --- a/WinMute/LogDialog.cpp +++ b/WinMute/LogDialog.cpp @@ -33,66 +33,23 @@ POSSIBILITY OF SUCH DAMAGE. #include "common.h" -static void TranslateLogDlgProc(HWND hDlg) -{ - WMi18n &i18n = WMi18n::GetInstance(); - SetWindowText(hDlg, i18n.GetTranslationW("log.title").c_str()); -} +struct LogDlgData { +}; -INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK LogDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - AboutDlgData *dlgData = - reinterpret_cast(GetWindowLongPtr(hDlg, GWLP_USERDATA)); + auto *dlgData = + reinterpret_cast(GetWindowLongPtr(hDlg, GWLP_USERDATA)); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); switch (msg) { case WM_INITDIALOG: { - dlgData = new AboutDlgData(); + dlgData = new LogDlgData(); SetWindowLongPtr(hDlg, GWLP_USERDATA, reinterpret_cast(dlgData)); - dlgData->hTabCtrl = GetDlgItem(hDlg, IDC_ABOUT_TAB); - WMi18n &i18n = WMi18n::GetInstance(); - InsertTabItem(dlgData->hTabCtrl, ABOUT_TAB_GENERAL, i18n.GetTranslationW("about.tab.winmute")); - InsertTabItem(dlgData->hTabCtrl, ABOUT_TAB_LICENSE, i18n.GetTranslationW("about.tab.license")); - - TranslateAboutDlgProc(hDlg); - - dlgData->hTabs[ABOUT_TAB_GENERAL] = CreateDialog( - nullptr, - MAKEINTRESOURCE(IDD_ABOUT_WINMUTE), - hDlg, - About_GeneralDlgProc); - dlgData->hTabs[ABOUT_TAB_LICENSE] = CreateDialog( - nullptr, - MAKEINTRESOURCE(IDD_ABOUT_LICENSE), - hDlg, - About_LicenseDlgProc); - - - // Set title font - LOGFONT font; - font.lfHeight = 32; - font.lfWidth = 0; - font.lfEscapement = 0; - font.lfOrientation = 0; - font.lfWeight = FW_BOLD; - font.lfItalic = false; - font.lfUnderline = false; - font.lfStrikeOut = false; - font.lfEscapement = 0; - font.lfOrientation = 0; - font.lfOutPrecision = OUT_DEFAULT_PRECIS; - font.lfClipPrecision = CLIP_STROKE_PRECIS | CLIP_MASK | CLIP_TT_ALWAYS | CLIP_LH_ANGLES; - font.lfQuality = CLEARTYPE_QUALITY; - font.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN; - wcscpy_s(font.lfFaceName, L"Segoe UI"); - - dlgData->hTitleFont = CreateFontIndirect(&font); - SendMessage( - hTitle, - WM_SETFONT, - reinterpret_cast(dlgData->hTitleFont), - TRUE); + SetWindowText(hDlg, i18n.GetTranslationW("log.title").c_str()); HICON hIcon = LoadIcon( GetModuleHandle(nullptr), @@ -104,7 +61,6 @@ INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: return 0; case WM_DESTROY: - DeleteObject(dlgData->hTitleFont); delete dlgData; SetWindowLongPtrW(hDlg, GWLP_USERDATA, 0); return 0; -- 2.43.0