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

Expose API to control surfaces z-order #73

Merged
MartinFouilleul merged 3 commits from surface_order into main 2023-08-28 15:47:20 +00:00
Conversation 0 Commits 3 Files Changed 10 +64 -18
3 changed files with 64 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 02bfe30672 - Show all commits

48
src/app/osx_app.m
View File

@ -1750,23 +1750,51 @@ void oc_osx_update_layers(oc_window_data* window)
void oc_osx_surface_bring_to_front(oc_surface_data* surface)
{
oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
if(window)
dispatch_block_t block = ^{
@autoreleasepool
{
oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
if(window)
{
oc_list_remove(&window->osx.layers, &surface->layer.listElt);
oc_list_push_back(&window->osx.layers, &surface->layer.listElt);
oc_osx_update_layers(window);
}
}
};
if([NSThread isMainThread])
{
oc_list_remove(&window->osx.layers, &surface->layer.listElt);
oc_list_push_back(&window->osx.layers, &surface->layer.listElt);
oc_osx_update_layers(window);
block();
}
else
{
dispatch_sync(dispatch_get_main_queue(), block);
}
}
void oc_osx_surface_send_to_back(oc_surface_data* surface)
{
oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
if(window)
dispatch_block_t block = ^{
@autoreleasepool
{
oc_window_data* window = oc_window_ptr_from_handle(surface->layer.window);
if(window)
{
oc_list_remove(&window->osx.layers, &surface->layer.listElt);
oc_list_push(&window->osx.layers, &surface->layer.listElt);
oc_osx_update_layers(window);
}
}
};
if([NSThread isMainThread])
{
oc_list_remove(&window->osx.layers, &surface->layer.listElt);
oc_list_push(&window->osx.layers, &surface->layer.listElt);
oc_osx_update_layers(window);
block();
}
else
{
dispatch_sync(dispatch_get_main_queue(), block);
}
}

2
src/runtime.c
View File

@ -675,6 +675,8 @@ i32 orca_runloop(void* user)
if(app->debugOverlay.show)
{
oc_surface_bring_to_front(app->debugOverlay.surface);
oc_ui_style debugUIDefaultStyle = { .bgColor = { 0 },
.color = { 1, 1, 1, 1 },
.font = app->debugOverlay.fontReg,

32
src/wasmbind/surface_api.json
View File

@ -36,6 +36,30 @@
{"name": "pixels",
"type": {"name": "u8*", "tag": "p"}}]
},
{
"name": "oc_surface_contents_scaling",
"cname": "oc_surface_contents_scaling",
"ret": {"name": "oc_vec2", "tag": "S"},
"args": [
{"name": "surface",
"type": {"name": "oc_surface", "tag": "S"}}]
},
{
"name": "oc_surface_bring_to_front",
"cname": "oc_surface_bring_to_front",
"ret": {"name": "void", "tag": "v"},
"args": [
{"name": "surface",
"type": {"name": "oc_surface", "tag": "S"}}]
},
{
"name": "oc_surface_send_to_back",
"cname": "oc_surface_send_to_back",
"ret": {"name": "void", "tag": "v"},
"args": [
{"name": "surface",
"type": {"name": "oc_surface", "tag": "S"}}]
},
{
"name": "oc_surface_select",
"cname": "oc_surface_select",
@ -52,14 +76,6 @@
{"name": "surface",
"type": {"name": "oc_surface", "tag": "S"}}]
},
{
"name": "oc_surface_contents_scaling",
"cname": "oc_surface_contents_scaling",
"ret": {"name": "oc_vec2", "tag": "S"},
"args": [
{"name": "surface",
"type": {"name": "oc_surface", "tag": "S"}}]
},
{
"name": "oc_surface_render_commands",
"cname": "orca_surface_render_commands",