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

And implemented the fullscreen stuff on Windows.

This commit is contained in:
Pietro Gagliardi 2016-06-16 10:30:44 -04:00
parent 132d925b70
commit aafdb75a98
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -20,6 +20,7 @@ This README is being written.<br>
* **16 June 2016** * **16 June 2016**
* Added `uiWindowContentSize()`, `uiWindowSetContentSize()`, and `uiWindowOnContentSizeChanged()` methods for manipulating uiWindow content sizes. Note the use of "content size"; the size you work with does NOT include window decorations (titlebars, menus, etc.). * Added `uiWindowContentSize()`, `uiWindowSetContentSize()`, and `uiWindowOnContentSizeChanged()` methods for manipulating uiWindow content sizes. Note the use of "content size"; the size you work with does NOT include window decorations (titlebars, menus, etc.).
* Added `uiWindowFullscreen()` and `uiWindowSetFullscreen()` to allow making fullscreen uiWindows, taking advantage of OS facilities for fullscreen and without changing the screen resolution (!).
* **15 June 2016** * **15 June 2016**
* Added `uiFormDelete()`; thanks to @emersion. * Added `uiFormDelete()`; thanks to @emersion.

53
windows/window.cpp
View File

@ -20,6 +20,8 @@ struct uiWindow {
void (*onContentSizeChanged)(uiWindow *, void *); void (*onContentSizeChanged)(uiWindow *, void *);
void *onContentSizeChangedData; void *onContentSizeChangedData;
BOOL changingSize; BOOL changingSize;
int fullscreen;
WINDOWPLACEMENT fsPrevPlacement;
}; };
// 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
@ -356,6 +358,12 @@ void uiWindowCenter(uiWindow *w)
uiWindowSetPosition(w, x, y); uiWindowSetPosition(w, x, y);
} }
void uiWindowOnPositionChanged(uiWindow *w, void (*f)(uiWindow *, void *), void *data)
{
w->onPositionChanged = f;
w->onPositionChangedData = data;
}
void uiWindowContentSize(uiWindow *w, int *width, int *height) void uiWindowContentSize(uiWindow *w, int *width, int *height)
{ {
RECT r; RECT r;
@ -375,18 +383,51 @@ void uiWindowSetContentSize(uiWindow *w, int width, int height)
w->changingSize = FALSE; w->changingSize = FALSE;
} }
int uiWindowFullscreen(uiWindow *w)
{
return w->fullscreen;
}
void uiWindowSetFullscreen(uiWindow *w, int fullscreen)
{
RECT r;
if (w->fullscreen && fullscreen)
return;
if (!w->fullscreen && !fullscreen)
return;
w->fullscreen = fullscreen;
w->changingSize = TRUE;
if (w->fullscreen) {
ZeroMemory(&(w->fsPrevPlacement), sizeof (WINDOWPLACEMENT));
w->fsPrevPlacement.length = sizeof (WINDOWPLACEMENT);
if (GetWindowPlacement(w->hwnd, &(w->fsPrevPlacement)) == 0)
logLastError(L"error getting old window placement");
windowMonitorRect(w->hwnd, &r);
setStyle(w->hwnd, getStyle(w->hwnd) & ~WS_OVERLAPPEDWINDOW);
if (SetWindowPos(w->hwnd, HWND_TOP,
r.left, r.top,
r.right - r.left, r.bottom - r.top,
SWP_FRAMECHANGED | SWP_NOOWNERZORDER) == 0)
logLastError(L"error making window fullscreen");
} else {
setStyle(w->hwnd, getStyle(w->hwnd) | WS_OVERLAPPEDWINDOW);
if (SetWindowPlacement(w->hwnd, &(w->fsPrevPlacement)) == 0)
logLastError(L"error leaving fullscreen");
if (SetWindowPos(w->hwnd, NULL,
0, 0, 0, 0,
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER) == 0)
logLastError(L"error restoring window border after fullscreen");
}
w->changingSize = FALSE;
}
void uiWindowOnContentSizeChanged(uiWindow *w, void (*f)(uiWindow *, void *), void *data) void uiWindowOnContentSizeChanged(uiWindow *w, void (*f)(uiWindow *, void *), void *data)
{ {
w->onContentSizeChanged = f; w->onContentSizeChanged = f;
w->onContentSizeChangedData = data; w->onContentSizeChangedData = data;
} }
void uiWindowOnPositionChanged(uiWindow *w, void (*f)(uiWindow *, void *), void *data)
{
w->onPositionChanged = f;
w->onPositionChangedData = data;
}
void uiWindowOnClosing(uiWindow *w, int (*f)(uiWindow *, void *), void *data) void uiWindowOnClosing(uiWindow *w, int (*f)(uiWindow *, void *), void *data)
{ {
w->onClosing = f; w->onClosing = f;