diff options
| author | StapleButter <thetotalworm@gmail.com> | 2017-10-02 23:26:25 +0200 |
|---|---|---|
| committer | StapleButter <thetotalworm@gmail.com> | 2017-10-02 23:26:25 +0200 |
| commit | dad0e6b6e85f0845b7437e33974f061283f28ecc (patch) | |
| tree | f646b8528b3de0ca90c230c862f40e832f4a45dc /src/libui_sdl/libui | |
| parent | f8b63759f722be1f2ae0156bea6957a739c1bb6f (diff) | |
add support for non-resizable windows
Diffstat (limited to 'src/libui_sdl/libui')
| -rw-r--r-- | src/libui_sdl/libui/ui.h | 2 | ||||
| -rw-r--r-- | src/libui_sdl/libui/windows/window.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/libui_sdl/libui/ui.h b/src/libui_sdl/libui/ui.h index 84a71c3..e78de5e 100644 --- a/src/libui_sdl/libui/ui.h +++ b/src/libui_sdl/libui/ui.h @@ -115,7 +115,7 @@ _UI_EXTERN void uiWindowSetChild(uiWindow *w, uiControl *child); _UI_EXTERN int uiWindowMargined(uiWindow *w); _UI_EXTERN void uiWindowSetMargined(uiWindow *w, int margined); _UI_EXTERN void uiWindowSetDropTarget(uiWindow* w, int drop); -_UI_EXTERN uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar); +_UI_EXTERN uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar, int resizable); _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); diff --git a/src/libui_sdl/libui/windows/window.cpp b/src/libui_sdl/libui/windows/window.cpp index e126efc..44fb306 100644 --- a/src/libui_sdl/libui/windows/window.cpp +++ b/src/libui_sdl/libui/windows/window.cpp @@ -512,7 +512,7 @@ static void setClientSize(uiWindow *w, int width, int height, BOOL hasMenubar, D logLastError(L"error resizing window"); } -uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar) +uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar, int resizable) { uiWindow *w; WCHAR *wtitle; @@ -525,8 +525,11 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar) hasMenubarBOOL = TRUE; w->hasMenubar = hasMenubarBOOL; -#define style WS_OVERLAPPEDWINDOW -#define exstyle 0 + int style = WS_OVERLAPPEDWINDOW; + int exstyle = 0; + + if (!resizable) + style &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX); wtitle = toUTF16(title); w->hwnd = CreateWindowExW(exstyle, |