Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-27 16:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Add line bar to About dialog for consistence

Browse source 
Addendum to f9d2931. CORE-15215
This commit is contained in:
Stanislav Motylkov 2019-03-23 20:53:01 +03:00 committed by Hermès BÉLUSCA - MAÏTO
parent ea2ca8fa91
commit cc99d3ad5f
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/shell32/bitmap_res.rc
View file

@ -1,4 +1,5 @@
IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp"
IDB_LINEBAR BITMAP "res/bitmaps/line.bmp"
IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204.bmp"
IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp"

BIN
dll/win32/shell32/res/bitmaps/line.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

1
dll/win32/shell32/shresdef.h
View file

@ -27,6 +27,7 @@
/* Bitmaps */
#define IDB_REACTOS 131
#define IDB_LINEBAR 138
#define IDB_SHELL_IEXPLORE_LG 204
#define IDB_SHELL_IEXPLORE_LG_HOT 205
#define IDB_SHELL_IEXPLORE_SM 206

19
dll/win32/shell32/wine/shell32_main.c
View file

@ -1132,8 +1132,8 @@ INT_PTR CALLBACK AboutAuthorsDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
{
static DWORD cxLogoBmp;
static DWORD cyLogoBmp;
static HBITMAP hLogoBmp;
static DWORD cyLogoBmp, cyLineBmp;
static HBITMAP hLogoBmp, hLineBmp;
static HWND hWndAuthors;
switch(msg)
@ -1153,8 +1153,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
// Preload the ROS bitmap
hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if(hLogoBmp)
if(hLogoBmp && hLineBmp)
{
BITMAP bmpLogo;
@ -1162,6 +1163,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
cxLogoBmp = bmpLogo.bmWidth;
cyLogoBmp = bmpLogo.bmHeight;
GetObject( hLineBmp, sizeof(BITMAP), &bmpLogo );
cyLineBmp = bmpLogo.bmHeight;
}
// Set App-specific stuff (icon, app name, szOtherStuff string)
@ -1258,20 +1262,25 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
case WM_PAINT:
{
if(hLogoBmp)
if(hLogoBmp && hLineBmp)
{
PAINTSTRUCT ps;
HDC hdc;
HDC hdcMem;
HGDIOBJ hOldObj;
hdc = BeginPaint(hWnd, &ps);
hdcMem = CreateCompatibleDC(hdc);
if(hdcMem)
{
SelectObject(hdcMem, hLogoBmp);
hOldObj = SelectObject(hdcMem, hLogoBmp);
BitBlt(hdc, 0, 0, cxLogoBmp, cyLogoBmp, hdcMem, 0, 0, SRCCOPY);
SelectObject(hdcMem, hLineBmp);
BitBlt(hdc, 0, cyLogoBmp, cxLogoBmp, cyLineBmp, hdcMem, 0, 0, SRCCOPY);
SelectObject(hdcMem, hOldObj);
DeleteDC(hdcMem);
}