Fixed color selection on Win32

This commit is contained in:
Daniel Collin 2013-01-09 18:56:53 +01:00
parent 4c1995e5a5
commit 5c590cc704

View File

@ -41,14 +41,17 @@ int Dialog_save(wchar_t* path, int pathSize)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static COLORREF custColors[16];
void Dialog_showColorPicker(unsigned int* color) void Dialog_showColorPicker(unsigned int* color)
{ {
CHOOSECOLOR cc; CHOOSECOLOR cc;
ZeroMemory(&cc, sizeof(CHOOSECOLOR)); ZeroMemory(&cc, sizeof(CHOOSECOLOR));
cc.lStructSize = sizeof(CHOOSECOLOR); cc.lStructSize = sizeof(CHOOSECOLOR);
cc.rgbResult = *color; cc.lpCustColors = (LPDWORD)custColors;
cc.rgbResult = *color & 0x00ffffff;
cc.Flags = CC_FULLOPEN | CC_RGBINIT; cc.Flags = CC_FULLOPEN | CC_RGBINIT;
cc.hwndOwner = s_window; cc.hwndOwner = s_window;
if (ChooseColor(&cc)) if (ChooseColor(&cc))
*color = cc.rgbResult; *color = cc.rgbResult | 0xff000000;
} }