From 225b506dd4dfeaebd92415d54ce67cd76675219f Mon Sep 17 00:00:00 2001 From: martinfouilleul Date: Tue, 25 Jul 2023 14:21:44 +0200 Subject: [PATCH 1/6] [win32, surface] automatically resize surfaces to parent window's client area --- milepost | 2 +- src/main.c | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/milepost b/milepost index 2a4e90c..3816e85 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit 2a4e90cf9aa88507640527a06b7ae08f25937155 +Subproject commit 3816e85592b5c68eeea4ed00001692f910a50c82 diff --git a/src/main.c b/src/main.c index de6a055..32de24e 100644 --- a/src/main.c +++ b/src/main.c @@ -479,9 +479,9 @@ void* orca_runloop(void* user) if(exports[G_EXPORT_FRAME_RESIZE]) { - mp_rect frame = mg_surface_get_frame(app->surface); - u32 width = (u32)frame.w; - u32 height = (u32)frame.h; + vec2 size = mg_surface_get_size(app->surface); + u32 width = (u32)size.x; + u32 height = (u32)size.y; const void* args[2] = {&width, &height}; m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args); } @@ -521,15 +521,12 @@ void* orca_runloop(void* user) case MP_EVENT_WINDOW_RESIZE: { - mp_rect frame = {0, 0, event->frame.rect.w, event->frame.rect.h}; - mg_surface_set_frame(app->surface, frame); - -// mg_surface_set_frame(app->debugOverlay.surface, frame); + mp_rect frame = {0, 0, event->move.frame.w, event->move.frame.h}; if(exports[G_EXPORT_FRAME_RESIZE]) { - u32 width = (u32)event->frame.rect.w; - u32 height = (u32)event->frame.rect.h; + u32 width = (u32)event->move.contents.w; + u32 height = (u32)event->move.contents.h; const void* args[2] = {&width, &height}; m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args); } @@ -561,8 +558,13 @@ void* orca_runloop(void* user) { if(exports[G_EXPORT_MOUSE_MOVE]) { +<<<<<<< Updated upstream const void* args[4] = {&event->move.x, &event->move.y, &event->move.deltaX, &event->move.deltaY}; m3_Call(exports[G_EXPORT_MOUSE_MOVE], 4, args); +======= + const void* args[4] = {&event->mouse.x, &event->mouse.y, &event->mouse.deltaX, &event->mouse.deltaY}; + m3_Call(eventHandlers[G_EVENT_MOUSE_MOVE], 4, args); +>>>>>>> Stashed changes } } break; @@ -614,8 +616,7 @@ void* orca_runloop(void* user) | UI_STYLE_FONT | UI_STYLE_FONT_SIZE; - mp_rect frameRect = mg_surface_get_frame(app->debugOverlay.surface); - vec2 frameSize = {frameRect.w, frameRect.h}; + vec2 frameSize = mg_surface_get_size(app->debugOverlay.surface); ui_frame(frameSize, &debugUIDefaultStyle, debugUIDefaultMask) { From 213663a09c260d72cd6bdbd71e3970b812c39461 Mon Sep 17 00:00:00 2001 From: Martin Fouilleul Date: Tue, 25 Jul 2023 17:02:38 +0200 Subject: [PATCH 2/6] [milepost update] use autoresizeMask to resize surfaces to the parent window's client area --- milepost | 2 +- src/main.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/milepost b/milepost index 3816e85..e7cce5e 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit 3816e85592b5c68eeea4ed00001692f910a50c82 +Subproject commit e7cce5e36fd522a20666e73e945a6aeca1f4ed8b diff --git a/src/main.c b/src/main.c index 32de24e..f73dbaa 100644 --- a/src/main.c +++ b/src/main.c @@ -558,13 +558,8 @@ void* orca_runloop(void* user) { if(exports[G_EXPORT_MOUSE_MOVE]) { -<<<<<<< Updated upstream - const void* args[4] = {&event->move.x, &event->move.y, &event->move.deltaX, &event->move.deltaY}; - m3_Call(exports[G_EXPORT_MOUSE_MOVE], 4, args); -======= const void* args[4] = {&event->mouse.x, &event->mouse.y, &event->mouse.deltaX, &event->mouse.deltaY}; - m3_Call(eventHandlers[G_EVENT_MOUSE_MOVE], 4, args); ->>>>>>> Stashed changes + m3_Call(exports[G_EXPORT_MOUSE_MOVE], 4, args); } } break; From 756b085c5f90ecfa7ba7cff266de55779dd7125e Mon Sep 17 00:00:00 2001 From: Martin Fouilleul Date: Wed, 26 Jul 2023 15:58:39 +0200 Subject: [PATCH 3/6] [osx] update milepost, more consistent window rect api --- milepost | 2 +- src/main.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/milepost b/milepost index e7cce5e..1fd9d17 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit e7cce5e36fd522a20666e73e945a6aeca1f4ed8b +Subproject commit 1fd9d17e8282f87ce07be10db1fdc4ae198775f7 diff --git a/src/main.c b/src/main.c index f73dbaa..874681f 100644 --- a/src/main.c +++ b/src/main.c @@ -479,9 +479,9 @@ void* orca_runloop(void* user) if(exports[G_EXPORT_FRAME_RESIZE]) { - vec2 size = mg_surface_get_size(app->surface); - u32 width = (u32)size.x; - u32 height = (u32)size.y; + mp_rect content = mp_window_get_content_rect(app->window); + u32 width = (u32)content.w; + u32 height = (u32)content.h; const void* args[2] = {&width, &height}; m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args); } @@ -525,8 +525,8 @@ void* orca_runloop(void* user) if(exports[G_EXPORT_FRAME_RESIZE]) { - u32 width = (u32)event->move.contents.w; - u32 height = (u32)event->move.contents.h; + u32 width = (u32)event->move.content.w; + u32 height = (u32)event->move.content.h; const void* args[2] = {&width, &height}; m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args); } From de28d37d5796c8c52945926087cb1e7a04ffbcd5 Mon Sep 17 00:00:00 2001 From: martinfouilleul Date: Wed, 26 Jul 2023 16:55:04 +0200 Subject: [PATCH 4/6] [win32] update window rect API and reported window sizes to match macos --- milepost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milepost b/milepost index 1fd9d17..2c0d326 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit 1fd9d17e8282f87ce07be10db1fdc4ae198775f7 +Subproject commit 2c0d3268e71f023b8b233702ec3a7b433c83f55b From a1068c979a490c37c9f3e5dceff898e362ea1dce Mon Sep 17 00:00:00 2001 From: martinfouilleul Date: Wed, 26 Jul 2023 17:38:24 +0200 Subject: [PATCH 5/6] [win32] fix mp_window_center() --- milepost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milepost b/milepost index 2c0d326..0785b6b 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit 2c0d3268e71f023b8b233702ec3a7b433c83f55b +Subproject commit 0785b6b637ca5290c8a6f4218517515e9cb46935 From 81b700121feb4250a84b538fd7d5f6a4160544b5 Mon Sep 17 00:00:00 2001 From: martinfouilleul Date: Wed, 26 Jul 2023 17:42:48 +0200 Subject: [PATCH 6/6] update milepost --- milepost | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milepost b/milepost index 0785b6b..0caeccd 160000 --- a/milepost +++ b/milepost @@ -1 +1 @@ -Subproject commit 0785b6b637ca5290c8a6f4218517515e9cb46935 +Subproject commit 0caeccd3fba14e45f5666fa0f99fd719c9bef5fc