From 695ebfa9ad69b452142505b6737dfdcf5bf22855 Mon Sep 17 00:00:00 2001 From: toehead2001 Date: Mon, 9 Nov 2015 04:39:36 -0700 Subject: [PATCH] Use a standard window for the About Dialog --- Source/Project64/Project64.vcxproj | 2 +- Source/Project64/Project64.vcxproj.filters | 6 +- .../Bitmaps/AboutScreenLogo.bmp | Bin 0 -> 126294 bytes Source/Project64/User Interface/Gui Class.cpp | 107 ++++-------------- .../Project64/User Interface/UI Resources.rc | 8 +- Source/Project64/User Interface/resource.h | 2 +- 6 files changed, 31 insertions(+), 94 deletions(-) create mode 100644 Source/Project64/User Interface/Bitmaps/AboutScreenLogo.bmp diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index c0fc9b536..45a6e4904 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -157,9 +157,9 @@ + - diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters index e831f9869..9805e41ad 100644 --- a/Source/Project64/Project64.vcxproj.filters +++ b/Source/Project64/Project64.vcxproj.filters @@ -431,9 +431,6 @@ Resource Files - - Resource Files - Resource Files @@ -455,6 +452,9 @@ Resource Files + + Resource Files + diff --git a/Source/Project64/User Interface/Bitmaps/AboutScreenLogo.bmp b/Source/Project64/User Interface/Bitmaps/AboutScreenLogo.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9d8822f82d90f91ddad521a694793d577dcd0945 GIT binary patch literal 126294 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 literal 0 HcmV?d00001 diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp index e60f3754c..8b46abed9 100644 --- a/Source/Project64/User Interface/Gui Class.cpp +++ b/Source/Project64/User Interface/Gui Class.cpp @@ -973,45 +973,9 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO return TRUE; } -WNDPROC pfnWndAboutBoxCancelProc = NULL; -HBITMAP hCloseButton = NULL; - -DWORD CALLBACK AboutBoxCancelProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) -{ - switch (uMsg) { - case WM_PAINT: - { - PAINTSTRUCT ps; - - if (BeginPaint(hWnd, &ps)) - { - if (hCloseButton) - { - RECT rcClient; - GetClientRect(hWnd, &rcClient); - - BITMAP bmTL1; - GetObject(hCloseButton, sizeof(BITMAP), &bmTL1); - HDC memdc = CreateCompatibleDC(ps.hdc); - HGDIOBJ save = SelectObject(memdc, hCloseButton); - BitBlt(ps.hdc, 0, 0, bmTL1.bmWidth, bmTL1.bmHeight, memdc, 0, 0, SRCCOPY); - SelectObject(memdc, save); - DeleteDC(memdc); - } - EndPaint(hWnd, &ps); - } - } - break; - } - - return CallWindowProc(pfnWndAboutBoxCancelProc, hWnd, uMsg, wParam, lParam); -} - DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) { static HBITMAP hbmpBackgroundTop = NULL; - static HBITMAP hbmpBackgroundBottom = NULL; - static HBITMAP hbmpBackgroundMiddle = NULL; static HFONT hPageHeadingFont = NULL; static HFONT hTextFont = NULL; static HFONT hAuthorFont = NULL; @@ -1019,24 +983,18 @@ DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) switch (uMsg) { case WM_INITDIALOG: { - enum { ROUND_EDGE = 15 }; - - DWORD dwStyle = GetWindowLong(hWnd, GWL_STYLE); - dwStyle &= ~(WS_CAPTION | WS_SIZEBOX); - SetWindowLong(hWnd, GWL_STYLE, dwStyle); + //Title + LONG_PTR originalWndProc = GetWindowLongPtrW(hWnd, GWLP_WNDPROC); + SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)DefWindowProcW); + SetWindowTextW(hWnd, GS(PLUG_ABOUT)); + SetWindowLongPtrW(hWnd, GWLP_WNDPROC, originalWndProc); // Use the size of the image - hbmpBackgroundTop = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_ABOUT_TOP)); - hbmpBackgroundBottom = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_ABOUT_BOTTOM)); - hbmpBackgroundMiddle = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_ABOUT_MIDDLE)); + hbmpBackgroundTop = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_ABOUT_LOGO)); BITMAP bmTL; GetObject(hbmpBackgroundTop, sizeof(BITMAP), &bmTL); - hCloseButton = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CLOSE_NORMAL)); - pfnWndAboutBoxCancelProc = (WNDPROC)::GetWindowLongPtr(GetDlgItem(hWnd, IDCANCEL), GWLP_WNDPROC); - ::SetWindowLongPtr(GetDlgItem(hWnd, IDCANCEL), GWLP_WNDPROC, (LONG_PTR)AboutBoxCancelProc); - if (hbmpBackgroundTop) { // int iHeight = bmTL.bmHeight; @@ -1047,13 +1005,6 @@ DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) rect.left -= rect.left; rect.bottom -= rect.top; rect.top -= rect.top; - - HRGN hWindowRegion = CreateRoundRectRgn(rect.left, rect.top, rect.left + iWidth + GetSystemMetrics(SM_CXEDGE) - 1, rect.bottom + GetSystemMetrics(SM_CYEDGE) - 1, ROUND_EDGE, ROUND_EDGE); - if (hWindowRegion) - { - SetWindowRgn(hWnd, hWindowRegion, TRUE); - DeleteObject(hWindowRegion); - } } hTextFont = ::CreateFont(18, 0, 0, 0, FW_NORMAL, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, DEFAULT_PITCH | FF_DONTCARE, "Arial"); @@ -1114,6 +1065,22 @@ DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) return (LONG)(LRESULT)((HBRUSH)GetStockObject(NULL_BRUSH)); } break; + case WM_ERASEBKGND: + { + HPEN outline; + HBRUSH fill; + RECT rect; + + outline = CreatePen(PS_SOLID, 1, 0x00FFFFFF); + fill = CreateSolidBrush(0x00FFFFFF); + SelectObject((HDC)wParam, outline); + SelectObject((HDC)wParam, fill); + + GetClientRect(hWnd, &rect); + + Rectangle((HDC)wParam, rect.left, rect.top, rect.right, rect.bottom); + } + break; case WM_PAINT: { PAINTSTRUCT ps; @@ -1123,10 +1090,8 @@ DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) RECT rcClient; GetClientRect(hWnd, &rcClient); - BITMAP bmTL_top, bmTL_bottom, bmTL_Middle; + BITMAP bmTL_top; GetObject(hbmpBackgroundTop, sizeof(BITMAP), &bmTL_top); - GetObject(hbmpBackgroundBottom, sizeof(BITMAP), &bmTL_bottom); - GetObject(hbmpBackgroundMiddle, sizeof(BITMAP), &bmTL_Middle); HDC memdc = CreateCompatibleDC(ps.hdc); HGDIOBJ save = SelectObject(memdc, hbmpBackgroundTop); @@ -1134,24 +1099,6 @@ DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) SelectObject(memdc, save); DeleteDC(memdc); - memdc = CreateCompatibleDC(ps.hdc); - save = SelectObject(memdc, hbmpBackgroundMiddle); - for (int x = bmTL_top.bmHeight; x < rcClient.bottom; x += bmTL_Middle.bmHeight) - { - BitBlt(ps.hdc, 0, x, bmTL_Middle.bmWidth, bmTL_Middle.bmHeight, memdc, 0, 0, SRCCOPY); - } - SelectObject(memdc, save); - DeleteDC(memdc); - - BITMAP; - memdc = CreateCompatibleDC(ps.hdc); - save = SelectObject(memdc, hbmpBackgroundBottom); - BitBlt(ps.hdc, 0, rcClient.bottom - bmTL_bottom.bmHeight, bmTL_bottom.bmWidth, bmTL_bottom.bmHeight, memdc, 0, 0, SRCCOPY); - SelectObject(memdc, save); - DeleteDC(memdc); - - BITMAP; - EndPaint(hWnd, &ps); } } @@ -1165,14 +1112,6 @@ DWORD CALLBACK AboutBoxProc(HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) { DeleteObject(hbmpBackgroundTop); } - if (hbmpBackgroundBottom) - { - DeleteObject(hbmpBackgroundBottom); - } - if (hbmpBackgroundMiddle) - { - DeleteObject(hbmpBackgroundMiddle); - } if (hTextFont) { ::DeleteObject(hTextFont); diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc index 3c1555d97..27a521eb3 100644 --- a/Source/Project64/User Interface/UI Resources.rc +++ b/Source/Project64/User Interface/UI Resources.rc @@ -383,12 +383,10 @@ BEGIN PUSHBUTTON "OK",IDOK,134,230,47,13 END -IDD_About DIALOGEX 0, 0, 254, 258 -STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR +IDD_About DIALOGEX 0, 0, 233, 265 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - PUSHBUTTON "X",IDCANCEL,211,8,14,13,BS_LEFT,WS_EX_RIGHT | WS_EX_RTLREADING LTEXT "Core Project 64 Team:",IDC_TEAM,15,87,168,17 LTEXT "Zilmar",IDC_ZILMAR,15,108,49,11 LTEXT "founder. Core and application programmer. Web site.",IDC_ZILMAR_DETAILS,69,107,151,24 @@ -889,7 +887,7 @@ END IDB_TRI_STATE BITMAP "Bitmaps\\tri-state.bmp" IDB_LISTITEMS BITMAP "Bitmaps\\ListItems.bmp" -IDB_CLOSE_NORMAL BITMAP "Bitmaps\\CloseNormal.bmp" +IDB_ABOUT_LOGO BITMAP "Bitmaps\\AboutScreenLogo.bmp" IDB_ABOUT_TOP BITMAP "Bitmaps\\AboutScreenTop.bmp" IDB_ABOUT_BOTTOM BITMAP "Bitmaps\\AboutScreenBottom.bmp" IDB_ABOUT_MIDDLE BITMAP "Bitmaps\\AboutScreenMiddle.bmp" diff --git a/Source/Project64/User Interface/resource.h b/Source/Project64/User Interface/resource.h index 42c1d2172..ed3fe6642 100644 --- a/Source/Project64/User Interface/resource.h +++ b/Source/Project64/User Interface/resource.h @@ -34,7 +34,7 @@ #define IDD_Settings_RomBrowser 140 #define IDD_About_UserInfo 141 #define IDD_About_Ini 143 -#define IDB_CLOSE_NORMAL 143 +#define IDB_ABOUT_LOGO 143 #define IDD_Settings_General 144 #define IDB_ABOUT_TOP 144 #define IDD_Settings_Accelerator 145