dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use old bitmap on low-bpp displays

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7300 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-08-21 22:18:38 +00:00
parent 0302344430
commit aca76bc307
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Contrib/Makensisw/toolbar.cpp
View file

@ -102,7 +102,8 @@ static void LoadToolBarImages()
else
imgsize = 16, iloffs = 0 * iltypecount;
if (hasCC4_70)
UINT dispbpp = GetScreenBPP(hTB);
if (hasCC4_70 && dispbpp > 8)
{
// Version 4.70 => Modern toolbar, 24-bit bitmaps
g_toolbar.imagelist = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(g_TBIL[iloffs+0]), imgsize, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
@ -111,9 +112,6 @@ static void LoadToolBarImages()
SendMessage(hTB, TB_SETIMAGELIST, 0, (LPARAM) g_toolbar.imagelist);
SendMessage(hTB, TB_SETDISABLEDIMAGELIST, 0, (LPARAM) g_toolbar.imagelistd);
SendMessage(hTB, TB_SETHOTIMAGELIST, 0, (LPARAM) g_toolbar.imagelisth);
if (hasCC4_71)
SendMessage(hTB, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
}
else
{
@ -123,6 +121,7 @@ static void LoadToolBarImages()
tbBitmap.nID = IDB_TOOLBAR;
SendMessage(hTB, TB_ADDBITMAP, IMAGECOUNT, (LPARAM) &tbBitmap);
}
if (hasCC4_71) SendMessage(hTB, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
}
void UpdateToolBarCompressorButton()
@ -200,7 +199,9 @@ static void ShowToolbarDropdownMenu(const NMTOOLBAR&nmtb, HWND hNotifyWnd, HMENU
POINT pt;
HMENU hMenu = SubMenuId == static_cast<UINT>(-1) ? hParentMenu : FindSubMenu(hParentMenu, SubMenuId);
UINT tpmf = GetToolbarDropdownMenuPos(nmtb.hdr.hwndFrom, nmtb.iItem, pt);
SendMessage(g_tip.tip, TTM_ACTIVATE, false, 0);
TrackPopupMenu(hMenu, tpmf, pt.x, pt.y, 0, hNotifyWnd, NULL);
SendMessage(g_tip.tip, TTM_ACTIVATE, true, 0);
}
void ShowCompressorToolbarDropdownMenu(const NMTOOLBAR&nmtb)