ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 04:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

added special logo bitmap for 4 bpp color resolution

Browse Source 
svn path=/trunk/; revision=8023
This commit is contained in:
Martin Fuchs
2004-02-04 09:29:53 +00:00
parent 9896efb9e2
commit 6505062b5a
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsys/system/explorer/explorer_intres.h
+1
View File
@@ -86,6 +86,7 @@
#define IDB_ICON_ALIGN_8 161
#define IDB_ICON_ALIGN_9 162
#define IDB_ICON_ALIGN_10 163
#define IDB_LOGOV16 164
#define ID_VIEW_NAME 401
#define ID_VIEW_ALL_ATTRIBUTES 402
#define ID_VIEW_SELECTED_ATTRIBUTES 403
reactos/subsys/system/explorer/explorer_intres.rc
+1
View File
@@ -151,6 +151,7 @@ IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
IDB_DRIVEBAR BITMAP DISCARDABLE "res/drivebar.bmp"
IDB_LOGOV BITMAP DISCARDABLE "res/logov.bmp"
IDB_LOGOV256 BITMAP DISCARDABLE "res/logov256.bmp"
IDB_LOGOV16 BITMAP DISCARDABLE "res/logov16.bmp"
/////////////////////////////////////////////////////////////////////////////
//
reactos/subsys/system/explorer/res/logov16.bmp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

reactos/subsys/system/explorer/taskbar/startmenu.cpp
+3 -12
View File
@@ -1473,17 +1473,16 @@ void StartMenuRoot::Paint(PaintCanvas& canvas)
{
int clr_bits;
{WindowCanvas dc(_hwnd); clr_bits=GetDeviceCaps(dc, BITSPIXEL);}
bool logo256 = clr_bits<=8;
MemCanvas mem_dc;
ResBitmap bmp(logo256? IDB_LOGOV256: IDB_LOGOV);
ResBitmap bmp(clr_bits<=8? clr_bits<=4? IDB_LOGOV16: IDB_LOGOV256: IDB_LOGOV);
BitmapSelection sel(mem_dc, bmp);
ClientRect clnt(_hwnd);
int h = min(_logo_size.cy, clnt.bottom);
RECT rect = {0, 0, _logo_size.cx-1, clnt.bottom-h};
HBRUSH hbr = CreateSolidBrush(logo256? RGB(166,202,240): RGB(71,103,121)); //RGB(255,255,255)); // same color as the background color in the logo bitmap
RECT rect = {0, 0, _logo_size.cx, clnt.bottom-h};
HBRUSH hbr = CreateSolidBrush(clr_bits<=8? clr_bits<=4? RGB(192,192,192): RGB(166,202,240): RGB(71,103,121)); // same color as the background color in the logo bitmap
FillRect(canvas, &rect, hbr);
DeleteObject(hbr);
@@ -1491,14 +1490,6 @@ void StartMenuRoot::Paint(PaintCanvas& canvas)
BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, 0, SRCCOPY);
if (!logo256) {
rect.left = rect.right++;
rect.bottom = clnt.bottom;
HBRUSH hbr_border = GetStockBrush(GRAY_BRUSH); //CreateSolidBrush(RGB(71,88,85));
FillRect(canvas, &rect, hbr_border);
//DeleteObject(hbr_border);
}
super::Paint(canvas);
}