piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

libui: add API for setting a background color for uiArea. (TODO: do for GTK)

Browse Source 
make window background black.
This commit is contained in:
StapleButter
2017-11-23 19:28:06 +01:00
parent b96ac8e000
commit 8e6d834f13
5 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libui_sdl/libui/ui.h
View File

@ -334,6 +334,7 @@ _UI_EXTERN void uiAreaScrollTo(uiArea *a, double x, double y, double width, doub
// TODO release capture?
_UI_EXTERN void uiAreaBeginUserWindowMove(uiArea *a);
_UI_EXTERN void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge);
_UI_EXTERN void uiAreaSetBackgroundColor(uiArea *a, int r, int g, int b);
_UI_EXTERN uiArea *uiNewArea(uiAreaHandler *ah);
_UI_EXTERN uiArea *uiNewScrollingArea(uiAreaHandler *ah, int width, int height);

13
src/libui_sdl/libui/windows/area.cpp
View File

@ -167,6 +167,15 @@ void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge)
wParam, 0);
}
void uiAreaSetBackgroundColor(uiArea *a, int r, int g, int b)
{
a->bgR = r;
a->bgG = g;
a->bgB = b;
}
uiArea *uiNewArea(uiAreaHandler *ah)
{
uiArea *a;
@ -184,6 +193,8 @@ uiArea *uiNewArea(uiAreaHandler *ah)
hInstance, a,
FALSE);
uiAreaSetBackgroundColor(a, -1, -1, -1);
return a;
}
@ -206,6 +217,8 @@ uiArea *uiNewScrollingArea(uiAreaHandler *ah, int width, int height)
hInstance, a,
FALSE);
uiAreaSetBackgroundColor(a, -1, -1, -1);
// set initial scrolling parameters
areaUpdateScroll(a);

2
src/libui_sdl/libui/windows/area.hpp
View File

@ -24,6 +24,8 @@ struct uiArea {
BOOL inside;
BOOL tracking;
int bgR, bgG, bgB;
ID2D1HwndRenderTarget *rt;
};

26
src/libui_sdl/libui/windows/areadraw.cpp
View File

@ -40,14 +40,24 @@ static HRESULT doPaint(uiArea *a, ID2D1RenderTarget *rt, RECT *clip)
// TODO only clear the clip area
// TODO clear with actual background brush
bgcolorref = GetSysColor(COLOR_BTNFACE);
bgcolor.r = ((float) GetRValue(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
// TODO now that -RTCc has just been deprecated entirely, should we switch back?
bgcolor.g = ((float) ((BYTE) ((bgcolorref & 0xFF00) >> 8))) / 255.0;
bgcolor.b = ((float) GetBValue(bgcolorref)) / 255.0;
bgcolor.a = 1.0;
if (a->bgR != -1)
{
bgcolor.r = ((float) a->bgR) / 255.0;
bgcolor.g = ((float) a->bgG) / 255.0;
bgcolor.b = ((float) a->bgB) / 255.0;
bgcolor.a = 1.0;
}
else
{
bgcolorref = GetSysColor(COLOR_BTNFACE);
bgcolor.r = ((float) GetRValue(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
// TODO now that -RTCc has just been deprecated entirely, should we switch back?
bgcolor.g = ((float) ((BYTE) ((bgcolorref & 0xFF00) >> 8))) / 255.0;
bgcolor.b = ((float) GetBValue(bgcolorref)) / 255.0;
bgcolor.a = 1.0;
}
rt->Clear(&bgcolor);
(*(ah->Draw))(ah, a, &dp);