hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

[win32, surface] automatically resize surfaces to parent window's client area

This commit is contained in:
martinfouilleul 2023-07-25 14:21:44 +02:00
parent b4893961fd
commit 225b506dd4
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
milepost

@ -1 +1 @@
Subproject commit 2a4e90cf9aa88507640527a06b7ae08f25937155 Subproject commit 3816e85592b5c68eeea4ed00001692f910a50c82

23
src/main.c
View File

@ -479,9 +479,9 @@ void* orca_runloop(void* user)
if(exports[G_EXPORT_FRAME_RESIZE]) if(exports[G_EXPORT_FRAME_RESIZE])
{ {
mp_rect frame = mg_surface_get_frame(app->surface); vec2 size = mg_surface_get_size(app->surface);
u32 width = (u32)frame.w; u32 width = (u32)size.x;
u32 height = (u32)frame.h; u32 height = (u32)size.y;
const void* args[2] = {&width, &height}; const void* args[2] = {&width, &height};
m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args); m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args);
} }
@ -521,15 +521,12 @@ void* orca_runloop(void* user)
case MP_EVENT_WINDOW_RESIZE: case MP_EVENT_WINDOW_RESIZE:
{ {
mp_rect frame = {0, 0, event->frame.rect.w, event->frame.rect.h}; mp_rect frame = {0, 0, event->move.frame.w, event->move.frame.h};
mg_surface_set_frame(app->surface, frame);
// mg_surface_set_frame(app->debugOverlay.surface, frame);
if(exports[G_EXPORT_FRAME_RESIZE]) if(exports[G_EXPORT_FRAME_RESIZE])
{ {
u32 width = (u32)event->frame.rect.w; u32 width = (u32)event->move.contents.w;
u32 height = (u32)event->frame.rect.h; u32 height = (u32)event->move.contents.h;
const void* args[2] = {&width, &height}; const void* args[2] = {&width, &height};
m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args); m3_Call(exports[G_EXPORT_FRAME_RESIZE], 2, args);
} }
@ -561,8 +558,13 @@ void* orca_runloop(void* user)
{ {
if(exports[G_EXPORT_MOUSE_MOVE]) if(exports[G_EXPORT_MOUSE_MOVE])
{ {
<<<<<<< Updated upstream
const void* args[4] = {&event->move.x, &event->move.y, &event->move.deltaX, &event->move.deltaY}; 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); 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; } break;
@ -614,8 +616,7 @@ void* orca_runloop(void* user)
| UI_STYLE_FONT | UI_STYLE_FONT
| UI_STYLE_FONT_SIZE; | UI_STYLE_FONT_SIZE;
mp_rect frameRect = mg_surface_get_frame(app->debugOverlay.surface); vec2 frameSize = mg_surface_get_size(app->debugOverlay.surface);
vec2 frameSize = {frameRect.w, frameRect.h};
ui_frame(frameSize, &debugUIDefaultStyle, debugUIDefaultMask) ui_frame(frameSize, &debugUIDefaultStyle, debugUIDefaultMask)
{ {