admin/mirror-processhacker
1
0
Fork 0
mirror of https://github.com/mirror/processhacker synced 2026-06-08 16:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed hardcoded plus/minus glyph size

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/processhacker/code@3025 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
wj32
2010-04-06 11:09:12 +00:00
parent 0723c65665
commit 013bea6dcb
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2.x/trunk/phlib/include/treelistp.h
+2
View File
@@ -48,7 +48,9 @@ typedef struct _PHP_TREELIST_CONTEXT
HTHEME ThemeData;
BOOLEAN ThemeActive;
HBITMAP PlusBitmap;
PH_INTEGER_PAIR PlusBitmapSize;
HBITMAP MinusBitmap;
PH_INTEGER_PAIR MinusBitmapSize;
HDC IconDc;
} PHP_TREELIST_CONTEXT, *PPHP_TREELIST_CONTEXT;
2.x/trunk/phlib/treelist.c
+37 -6
View File
@@ -544,8 +544,32 @@ LRESULT CALLBACK PhpTreeListWndProc(
return TRUE;
case TLM_SETPLUSMINUS:
{
context->PlusBitmap = (HBITMAP)wParam;
context->MinusBitmap = (HBITMAP)lParam;
HBITMAP plusBitmap = (HBITMAP)wParam;
HBITMAP minusBitmap = (HBITMAP)lParam;
BITMAP bitmap;
if (GetObject(plusBitmap, sizeof(BITMAP), &bitmap))
{
context->PlusBitmapSize.X = bitmap.bmWidth;
context->PlusBitmapSize.Y = bitmap.bmHeight;
}
else
{
return FALSE;
}
if (GetObject(minusBitmap, sizeof(BITMAP), &bitmap))
{
context->MinusBitmapSize.X = bitmap.bmWidth;
context->MinusBitmapSize.Y = bitmap.bmHeight;
}
else
{
return FALSE;
}
context->PlusBitmap = plusBitmap;
context->MinusBitmap = minusBitmap;
}
return TRUE;
case TLM_UPDATENODE:
@@ -1029,6 +1053,7 @@ static VOID PhpCustomDrawPrePaintSubItem(
{
BOOLEAN drewUsingTheme = FALSE;
RECT themeRect;
PH_INTEGER_PAIR glyphSize;
if (!node->s.IsLeaf)
{
@@ -1058,16 +1083,22 @@ static VOID PhpCustomDrawPrePaintSubItem(
Context->IconDc = CreateCompatibleDC(CustomDraw->nmcd.hdc);
if (node->Expanded)
{
SelectObject(Context->IconDc, Context->MinusBitmap);
glyphSize = Context->MinusBitmapSize;
}
else
{
SelectObject(Context->IconDc, Context->PlusBitmap);
glyphSize = Context->PlusBitmapSize;
}
BitBlt(
CustomDraw->nmcd.hdc,
textRect.left + (16 - 9) / 2, // TODO: un-hardcode the 9
textRect.top + (16 - 9) / 2,
9,
9,
textRect.left + (16 - glyphSize.X) / 2,
textRect.top + (16 - glyphSize.Y) / 2,
glyphSize.X,
glyphSize.Y,
Context->IconDc,
0,
0,