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

win32 implementation of oc_surface_bring_to_front/send_to_back

This commit is contained in:
martinfouilleul 2023-08-28 17:04:55 +02:00
parent 02bfe30672
commit ec97c6d9ca
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sketches/multi_surface/build.bat
View File

@ -3,4 +3,4 @@ set INCLUDES=/I ..\..\src /I ..\..\src\util /I ..\..\src\platform /I ../../ext /
if not exist "bin" mkdir bin if not exist "bin" mkdir bin
cl /we4013 /Zi /Zc:preprocessor /std:c11 /experimental:c11atomics %INCLUDES% main.c /link /LIBPATH:../../build/bin orca.dll.lib /out:bin/example_multi_surface.exe cl /we4013 /Zi /Zc:preprocessor /std:c11 /experimental:c11atomics %INCLUDES% main.c /link /LIBPATH:../../build/bin orca.dll.lib /out:bin/example_multi_surface.exe
cp ../../build/bin/orca.dll bin/ copy ..\..\build\bin\orca.dll bin

41
src/app/win32_app.c
View File

@ -266,20 +266,35 @@ static void oc_win32_update_child_layers(oc_window_data* window)
int clientWidth = (clientRect.right - clientRect.left); int clientWidth = (clientRect.right - clientRect.left);
int clientHeight = (clientRect.bottom - clientRect.top); int clientHeight = (clientRect.bottom - clientRect.top);
oc_list_for(&window->win32.layers, layer, oc_layer, listElt)
{
SetWindowPos(layer->hWnd,
0,
point.x,
point.y,
clientWidth,
clientHeight,
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
}
}
static void oc_win32_update_child_layers_zorder(oc_window_data* window)
{
HWND insertAfter = window->win32.hWnd; HWND insertAfter = window->win32.hWnd;
oc_list_for(&window->win32.layers, layer, oc_layer, listElt) oc_list_for(&window->win32.layers, layer, oc_layer, listElt)
{ {
SetWindowPos(layer->hWnd, SetWindowPos(layer->hWnd,
insertAfter, insertAfter,
point.x, 0, 0, 0, 0,
point.y, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW | SWP_NOOWNERZORDER);
clientWidth,
clientHeight,
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
insertAfter = layer->hWnd; insertAfter = layer->hWnd;
} }
SetWindowPos(window->win32.hWnd,
insertAfter,
0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW);
} }
LRESULT oc_win32_win_proc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam) LRESULT oc_win32_win_proc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
@ -1172,6 +1187,20 @@ void oc_win32_surface_set_hidden(oc_surface_data* surface, bool hidden)
ShowWindow(surface->layer.hWnd, hidden ? SW_HIDE : SW_NORMAL); ShowWindow(surface->layer.hWnd, hidden ? SW_HIDE : SW_NORMAL);
} }
void oc_win32_surface_bring_to_front(oc_surface_data* surface)
{
oc_list_remove(&surface->layer.parent->win32.layers, &surface->layer.listElt);
oc_list_push(&surface->layer.parent->win32.layers, &surface->layer.listElt);
oc_win32_update_child_layers_zorder(surface->layer.parent);
}
void oc_win32_surface_send_to_back(oc_surface_data* surface)
{
oc_list_remove(&surface->layer.parent->win32.layers, &surface->layer.listElt);
oc_list_push_back(&surface->layer.parent->win32.layers, &surface->layer.listElt);
oc_win32_update_child_layers_zorder(surface->layer.parent);
}
void* oc_win32_surface_native_layer(oc_surface_data* surface) void* oc_win32_surface_native_layer(oc_surface_data* surface)
{ {
return ((void*)surface->layer.hWnd); return ((void*)surface->layer.hWnd);
@ -1227,6 +1256,8 @@ void oc_surface_init_for_window(oc_surface_data* surface, oc_window_data* window
surface->getHidden = oc_win32_surface_get_hidden; surface->getHidden = oc_win32_surface_get_hidden;
surface->setHidden = oc_win32_surface_set_hidden; surface->setHidden = oc_win32_surface_set_hidden;
surface->nativeLayer = oc_win32_surface_native_layer; surface->nativeLayer = oc_win32_surface_native_layer;
surface->bringToFront = oc_win32_surface_bring_to_front;
surface->sendToBack = oc_win32_surface_send_to_back;
//NOTE(martin): create a child window for the surface //NOTE(martin): create a child window for the surface
WNDCLASS layerWindowClass = { .style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC, WNDCLASS layerWindowClass = { .style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC,

6
src/runtime.c
View File

@ -636,11 +636,11 @@ i32 orca_runloop(void* user)
{ {
if(event->key.action == OC_KEY_PRESS) if(event->key.action == OC_KEY_PRESS)
{ {
if(event->key.code == OC_KEY_D && (event->key.mods & (OC_KEYMOD_SHIFT | OC_KEYMOD_CMD))) if(event->key.code == OC_KEY_D
&& (event->key.mods & OC_KEYMOD_SHIFT)
&& (event->key.mods & OC_KEYMOD_MAIN_MODIFIER))
{ {
#if 1 // EPILEPSY WARNING! on windows this has a bug which causes a pretty strong stroboscopic effect
debug_overlay_toggle(&app->debugOverlay); debug_overlay_toggle(&app->debugOverlay);
#endif
} }
if(exports[OC_EXPORT_KEY_DOWN]) if(exports[OC_EXPORT_KEY_DOWN])