interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed assorted MSVC uiArea issues.

This commit is contained in:
Pietro Gagliardi 2015-11-27 22:44:42 -05:00
parent 14887ad7e3
commit 09129229fd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
windows/area.c
View File

@ -28,7 +28,7 @@ uiWindowsDefineControl(
// TODO highly unsafe code // TODO highly unsafe code
static void rtGetSize(ID2D1RenderTarget *rt, D2D1_SIZE_F *size) static void rtGetSize(ID2D1RenderTarget *rt, D2D1_SIZE_F *size)
{ {
typedef void (*STDMETHODCALLTYPE gsp)(ID2D1RenderTarget *, D2D1_SIZE_F *); typedef void (STDMETHODCALLTYPE *gsp)(ID2D1RenderTarget *, D2D1_SIZE_F *);
gsp gs; gsp gs;
gs = (gsp) (rt->lpVtbl->GetSize); gs = (gsp) (rt->lpVtbl->GetSize);
@ -60,9 +60,12 @@ static HRESULT doPaint(uiArea *a, ID2D1RenderTarget *rt, RECT *clip)
ID2D1RenderTarget_BeginDraw(rt); ID2D1RenderTarget_BeginDraw(rt);
// TODO only clear the clip area // TODO only clear the clip area
// TODO clear with actual background color
bgcolorref = GetSysColor(COLOR_BTNFACE); bgcolorref = GetSysColor(COLOR_BTNFACE);
bgcolor.r = ((float) GetRValue(bgcolorref)) / 255.0; bgcolor.r = ((float) GetRValue(bgcolorref)) / 255.0;
bgcolor.g = ((float) GetGValue(bgcolorref)) / 255.0; // due to utter apathy on Microsoft's part, GetGValue() does not work with MSVC's Run-Time Error Checks
// it has not worked since 2008 and they have *never* fixed it
bgcolor.g = ((float) ((BYTE) ((bgcolorref & 0xFF00) >> 8))) / 255.0;
bgcolor.b = ((float) GetBValue(bgcolorref)) / 255.0; bgcolor.b = ((float) GetBValue(bgcolorref)) / 255.0;
bgcolor.a = 1.0; bgcolor.a = 1.0;
ID2D1RenderTarget_Clear(rt, &bgcolor); ID2D1RenderTarget_Clear(rt, &bgcolor);
@ -193,7 +196,7 @@ static void wheelscroll(uiArea *a, int which, struct scrollParams *p, WPARAM wPa
delta += *(p->wheelCarry); delta += *(p->wheelCarry);
lines = delta * ((int) scrollAmount) / WHEEL_DELTA; lines = delta * ((int) scrollAmount) / WHEEL_DELTA;
*(p->wheelCarry) = delta - lines * WHEEL_DELTA / ((int) scrollAmount); *(p->wheelCarry) = delta - lines * WHEEL_DELTA / ((int) scrollAmount);
return scrollby(a, which, p, -lines); scrollby(a, which, p, -lines);
} }
static void hscrollParams(uiArea *a, struct scrollParams *p) static void hscrollParams(uiArea *a, struct scrollParams *p)