From e7ccbec8f5f0097ca54b8d7ea27e0815b069b57c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 4 Aug 2019 19:28:22 +0200 Subject: Replace size and aspect ratio init functions with dynamic ones --- pugl/detail/implementation.c | 20 ------------ pugl/detail/mac.m | 34 +++++++++++++++++++++ pugl/detail/win.c | 22 +++++++++++++ pugl/detail/x11.c | 38 +++++++++++++++++++++++ pugl/pugl.h | 73 ++++++++++++++++++++++++++++++-------------- 5 files changed, 144 insertions(+), 43 deletions(-) (limited to 'pugl') diff --git a/pugl/detail/implementation.c b/pugl/detail/implementation.c index d6e4b86..f971284 100644 --- a/pugl/detail/implementation.c +++ b/pugl/detail/implementation.c @@ -127,26 +127,6 @@ puglInitWindowHint(PuglView* view, PuglWindowHint hint, int value) } } -void -puglInitWindowMinSize(PuglView* view, int width, int height) -{ - view->minWidth = width; - view->minHeight = height; -} - -void -puglInitWindowAspectRatio(PuglView* view, - int minX, - int minY, - int maxX, - int maxY) -{ - view->minAspectX = minX; - view->minAspectY = minY; - view->maxAspectX = maxX; - view->maxAspectY = maxY; -} - void puglInitWindowClass(PuglView* view, const char* name) { diff --git a/pugl/detail/mac.m b/pugl/detail/mac.m index ea55c0f..6d156c6 100644 --- a/pugl/detail/mac.m +++ b/pugl/detail/mac.m @@ -966,3 +966,37 @@ puglSetFrame(PuglView* view, const PuglRect frame) return PUGL_SUCCESS; } + +PuglStatus +puglSetMinSize(PuglView* const view, const int width, const int height) +{ + view->minWidth = width; + view->minHeight = height; + + if (view->impl->window && (view->minWidth || view->minHeight)) { + [view->impl->window + setContentMinSize:NSMakeSize(view->minWidth, view->minHeight)]; + } + + return PUGL_SUCCESS; +} + +PuglStatus +puglSetAspectRatio(PuglView* const view, + const int minX, + const int minY, + const int maxX, + const int maxY) +{ + view->minAspectX = minX; + view->minAspectY = minY; + view->maxAspectX = maxX; + view->maxAspectY = maxY; + + if (view->impl->window && view->minAspectX && view->minAspectY) { + [view->impl->window setContentAspectRatio:NSMakeSize(view->minAspectX, + view->minAspectY)]; + } + + return PUGL_SUCCESS; +} diff --git a/pugl/detail/win.c b/pugl/detail/win.c index 2c4074c..96642cc 100644 --- a/pugl/detail/win.c +++ b/pugl/detail/win.c @@ -804,3 +804,25 @@ puglSetFrame(PuglView* view, const PuglRect frame) return PUGL_SUCCESS; } + +PuglStatus +puglSetMinSize(PuglView* const view, const int width, const int height) +{ + view->minWidth = width; + view->minHeight = height; + return PUGL_SUCCESS; +} + +PuglStatus +puglSetAspectRatio(PuglView* const view, + const int minX, + const int minY, + const int maxX, + const int maxY) +{ + view->minAspectX = minX; + view->minAspectY = minY; + view->maxAspectX = maxX; + view->maxAspectY = maxY; + return PUGL_SUCCESS; +} diff --git a/pugl/detail/x11.c b/pugl/detail/x11.c index 1e1f96f..d7b7677 100644 --- a/pugl/detail/x11.c +++ b/pugl/detail/x11.c @@ -723,3 +723,41 @@ puglSetFrame(PuglView* view, const PuglRect frame) return PUGL_SUCCESS; } + +PuglStatus +puglSetMinSize(PuglView* const view, const int width, const int height) +{ + Display* display = view->world->impl->display; + + view->minWidth = width; + view->minHeight = height; + + if (view->impl->win) { + XSizeHints sizeHints = getSizeHints(view); + XSetNormalHints(display, view->impl->win, &sizeHints); + } + + return PUGL_SUCCESS; +} + +PuglStatus +puglSetAspectRatio(PuglView* const view, + const int minX, + const int minY, + const int maxX, + const int maxY) +{ + Display* display = view->world->impl->display; + + view->minAspectX = minX; + view->minAspectY = minY; + view->maxAspectX = maxX; + view->maxAspectY = maxY; + + if (view->impl->win) { + XSizeHints sizeHints = getSizeHints(view); + XSetNormalHints(display, view->impl->win, &sizeHints); + } + + return PUGL_SUCCESS; +} diff --git a/pugl/pugl.h b/pugl/pugl.h index 6d2d8b1..26593f2 100644 --- a/pugl/pugl.h +++ b/pugl/pugl.h @@ -534,29 +534,6 @@ puglInitWindowClass(PuglView* view, const char* name); PUGL_API void puglInitWindowParent(PuglView* view, PuglNativeWindow parent); -/** - Set the minimum window size before creating a window. -*/ -PUGL_API void -puglInitWindowMinSize(PuglView* view, int width, int height); - -/** - Set the window aspect ratio range before creating a window. - - The x and y values here represent a ratio of width to height. To set a - fixed aspect ratio, set the minimum and maximum values to the same ratio. - - Note that setting different minimum and maximum constraints does not - currenty work on MacOS (the minimum is used), so only setting a fixed aspect - ratio works properly across all platforms. -*/ -PUGL_API void -puglInitWindowAspectRatio(PuglView* view, - int minX, - int minY, - int maxX, - int maxY); - /** Set transient parent before creating a window. @@ -647,6 +624,27 @@ puglGetFrame(const PuglView* view); PUGL_API PuglStatus puglSetFrame(PuglView* view, PuglRect frame); +/** + Set the minimum size of the view. + + To avoid stutter, this should be called before creating the window. +*/ +PUGL_API PuglStatus +puglSetMinSize(PuglView* view, int width, int height); + +/** + Set the window aspect ratio range. + + The x and y values here represent a ratio of width to height. To set a + fixed aspect ratio, set the minimum and maximum values to the same ratio. + + Note that setting different minimum and maximum constraints does not + currenty work on MacOS (the minimum is used), so only setting a fixed aspect + ratio works properly across all platforms. +*/ +PUGL_API PuglStatus +puglSetAspectRatio(PuglView* view, int minX, int minY, int maxX, int maxY); + /** @name Context Functions for accessing the drawing context. @@ -814,6 +812,35 @@ puglInitWindowSize(PuglView* view, int width, int height) puglSetFrame(view, frame); } +/** + Set the minimum window size before creating a window. +*/ +static inline PUGL_DEPRECATED_BY("puglSetMinSize") void +puglInitWindowMinSize(PuglView* view, int width, int height) +{ + puglSetMinSize(view, width, height); +} + +/** + Set the window aspect ratio range before creating a window. + + The x and y values here represent a ratio of width to height. To set a + fixed aspect ratio, set the minimum and maximum values to the same ratio. + + Note that setting different minimum and maximum constraints does not + currenty work on MacOS (the minimum is used), so only setting a fixed aspect + ratio works properly across all platforms. +*/ +static inline PUGL_DEPRECATED_BY("puglSetAspectRatio") void +puglInitWindowAspectRatio(PuglView* view, + int minX, + int minY, + int maxX, + int maxY) +{ + puglSetAspectRatio(view, minX, minY, maxX, maxY); +} + /** Enable or disable resizing before creating a window. -- cgit v1.2.1