diff options
Diffstat (limited to 'src/internal.c')
| -rw-r--r-- | src/internal.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/internal.c b/src/internal.c index 38a595a..ca84ed1 100644 --- a/src/internal.c +++ b/src/internal.c @@ -5,7 +5,7 @@ #include "types.h" -#include "pugl/pugl.h" +#include <pugl/pugl.h> #include <assert.h> #include <stdbool.h> @@ -23,7 +23,8 @@ make_point(const PuglCoord x, const PuglCoord y) bool puglIsValidPosition(const int x, const int y) { - return x >= INT16_MIN && x <= INT16_MAX && y >= INT16_MIN && y <= INT16_MAX; + // INT16_MIN is a sentinel, INT16_MAX is impossible with non-zero size + return x > INT16_MIN && x < INT16_MAX && y > INT16_MIN && y < INT16_MAX; } bool @@ -60,9 +61,10 @@ puglGetInitialPosition(const PuglView* const view, const PuglArea size) return make_point(view->lastConfigure.x, view->lastConfigure.y); } - if (puglIsValidPosition(view->defaultX, view->defaultY)) { + const PuglPoint defaultPos = view->positionHints[PUGL_DEFAULT_POSITION]; + if (puglIsValidPosition(defaultPos.x, defaultPos.y)) { // Use the default position hint set by the application - return make_point((PuglCoord)view->defaultX, (PuglCoord)view->defaultY); + return make_point(defaultPos.x, defaultPos.y); } if (view->parent) { @@ -247,7 +249,7 @@ puglDispatchSimpleEvent(PuglView* view, const PuglEventType type) type == PUGL_UPDATE || type == PUGL_CLOSE || type == PUGL_LOOP_ENTER || type == PUGL_LOOP_LEAVE); - const PuglEvent event = {{type, 0}}; + const PuglEvent event = {{type, 0U}}; return puglDispatchEvent(view, &event); } |