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

Started adding borderless uiWindow support; implemented on Windows.

This commit is contained in:
Pietro Gagliardi 2016-06-16 11:20:28 -04:00
parent aafdb75a98
commit 377f46814a
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/page15.c
View File

@ -93,11 +93,19 @@ void setFullscreen(uiCheckbox *cb, void *data)
updatesize(w); updatesize(w);
} }
static void borderless(uiCheckbox *c, void *data)
{
uiWindow *w = uiWindow(data);
uiWindowSetBorderless(w, uiCheckboxChecked(c));
}
uiBox *makePage15(uiWindow *w) uiBox *makePage15(uiWindow *w)
{ {
uiBox *page15; uiBox *page15;
uiBox *hbox; uiBox *hbox;
uiButton *button; uiButton *button;
uiCheckbox *checkbox;
page15 = newVerticalBox(); page15 = newVerticalBox();
@ -136,5 +144,9 @@ uiBox *makePage15(uiWindow *w)
uiWindowOnContentSizeChanged(w, onSize, NULL); uiWindowOnContentSizeChanged(w, onSize, NULL);
updatesize(w); updatesize(w);
checkbox = uiNewCheckbox("Borderless");
uiCheckboxOnToggled(checkbox, borderless, w);
uiBoxAppend(page15, uiControl(checkbox), 0);
return page15; return page15;
} }

2
ui.h
View File

@ -109,6 +109,8 @@ _UI_EXTERN int uiWindowFullscreen(uiWindow *w);
_UI_EXTERN void uiWindowSetFullscreen(uiWindow *w, int fullscreen); _UI_EXTERN void uiWindowSetFullscreen(uiWindow *w, int fullscreen);
_UI_EXTERN void uiWindowOnContentSizeChanged(uiWindow *w, void (*f)(uiWindow *, void *), void *data); _UI_EXTERN void uiWindowOnContentSizeChanged(uiWindow *w, void (*f)(uiWindow *, void *), void *data);
_UI_EXTERN void uiWindowOnClosing(uiWindow *w, int (*f)(uiWindow *w, void *data), void *data); _UI_EXTERN void uiWindowOnClosing(uiWindow *w, int (*f)(uiWindow *w, void *data), void *data);
_UI_EXTERN int uiWindowBorderless(uiWindow *w);
_UI_EXTERN void uiWindowSetBorderless(uiWindow *w, int borderless);
_UI_EXTERN void uiWindowSetChild(uiWindow *w, uiControl *child); _UI_EXTERN void uiWindowSetChild(uiWindow *w, uiControl *child);
_UI_EXTERN int uiWindowMargined(uiWindow *w); _UI_EXTERN int uiWindowMargined(uiWindow *w);
_UI_EXTERN void uiWindowSetMargined(uiWindow *w, int margined); _UI_EXTERN void uiWindowSetMargined(uiWindow *w, int margined);

19
windows/window.cpp
View File

@ -22,6 +22,7 @@ struct uiWindow {
BOOL changingSize; BOOL changingSize;
int fullscreen; int fullscreen;
WINDOWPLACEMENT fsPrevPlacement; WINDOWPLACEMENT fsPrevPlacement;
int borderless;
}; };
// from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing // from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
@ -411,7 +412,8 @@ void uiWindowSetFullscreen(uiWindow *w, int fullscreen)
SWP_FRAMECHANGED | SWP_NOOWNERZORDER) == 0) SWP_FRAMECHANGED | SWP_NOOWNERZORDER) == 0)
logLastError(L"error making window fullscreen"); logLastError(L"error making window fullscreen");
} else { } else {
setStyle(w->hwnd, getStyle(w->hwnd) | WS_OVERLAPPEDWINDOW); if (!w->borderless) // keep borderless until that is turned off
setStyle(w->hwnd, getStyle(w->hwnd) | WS_OVERLAPPEDWINDOW);
if (SetWindowPlacement(w->hwnd, &(w->fsPrevPlacement)) == 0) if (SetWindowPlacement(w->hwnd, &(w->fsPrevPlacement)) == 0)
logLastError(L"error leaving fullscreen"); logLastError(L"error leaving fullscreen");
if (SetWindowPos(w->hwnd, NULL, if (SetWindowPos(w->hwnd, NULL,
@ -434,6 +436,21 @@ void uiWindowOnClosing(uiWindow *w, int (*f)(uiWindow *, void *), void *data)
w->onClosingData = data; w->onClosingData = data;
} }
int uiWindowBorderless(uiWindow *w)
{
return w->borderless;
}
void uiWindowSetBorderless(uiWindow *w, int borderless)
{
w->borderless = borderless;
if (w->borderless)
setStyle(w->hwnd, getStyle(w->hwnd) & ~WS_OVERLAPPEDWINDOW);
else
if (!w->fullscreen) // keep borderless until leaving fullscreen
setStyle(w->hwnd, getStyle(w->hwnd) | WS_OVERLAPPEDWINDOW);
}
void uiWindowSetChild(uiWindow *w, uiControl *child) void uiWindowSetChild(uiWindow *w, uiControl *child)
{ {
if (w->child != NULL) { if (w->child != NULL) {