nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-07 09:59:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

add new function

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@188 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-07 02:26:40 +00:00
parent f70b20a6e6
commit cc0b61f0ab
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Mw/LowLevel.h
View File

@@ -81,6 +81,7 @@ MWDECL void MwLLForceRender(MwLL handle);
MWDECL void MwLLSetCursor(MwLL handle, MwCursor* image, MwCursor* mask); MWDECL void MwLLSetCursor(MwLL handle, MwCursor* image, MwCursor* mask);
MWDECL void MwLLDetach(MwLL handle, MwPoint* point); MWDECL void MwLLDetach(MwLL handle, MwPoint* point);
MWDECL void MwLLShow(MwLL handle, int show);
#ifdef __cplusplus #ifdef __cplusplus
} }

5
src/backend/gdi.c
View File

@@ -389,3 +389,8 @@ void MwLLDetach(MwLL handle, MwPoint* point) {
SetWindowLongPtr(handle->hWnd, GWL_STYLE, style); SetWindowLongPtr(handle->hWnd, GWL_STYLE, style);
} }
void MwLLShow(MwLL handle, int show) {
ShowWindow(handle->hWnd, show ? SW_NORMAL : SW_HIDE);
if(show) SetFocus(handle->hWnd);
}

12
src/backend/x11.c
View File

@@ -387,7 +387,13 @@ void MwLLDetach(MwLL handle, MwPoint* point) {
XTranslateCoordinates(handle->display, parent, RootWindow(handle->display, DefaultScreen(handle->display)), 0, 0, &x, &y, &child); XTranslateCoordinates(handle->display, parent, RootWindow(handle->display, DefaultScreen(handle->display)), 0, 0, &x, &y, &child);
XReparentWindow(handle->display, handle->window, RootWindow(handle->display, DefaultScreen(handle->display)), x + point->x, y + point->y); XReparentWindow(handle->display, handle->window, RootWindow(handle->display, DefaultScreen(handle->display)), x + point->x, y + point->y);
}
XMapWindow(handle->display, handle->window);
// XSetInputFocus(handle->display, handle->window, RevertToNone, CurrentTime); void MwLLShow(MwLL handle, int show) {
if(show) {
XMapWindow(handle->display, handle->window);
XSetInputFocus(handle->display, handle->window, RevertToNone, CurrentTime);
} else {
XUnmapWindow(handle->display, handle->window);
}
} }

16
src/widget/submenu.c
View File

@@ -4,14 +4,7 @@
#include "../external/stb_ds.h" #include "../external/stb_ds.h"
static int create(MwWidget handle) { static int create(MwWidget handle) {
/* todo: we should have a public "show" function here that is implemented per MwLLShow(handle->lowlevel, 0);
platform, as opposed to just shoving it here. perchance. */
#ifdef _WIN32
ShowWindow(handle->lowlevel->hWnd, SW_HIDE);
#endif
#ifdef UNIX
XUnmapWindow(handle->lowlevel->display, handle->lowlevel->window);
#endif
MwSetDefault(handle); MwSetDefault(handle);
@@ -181,15 +174,14 @@ void MwSubMenuAppear(MwWidget handle, MwMenu menu, MwPoint* point) {
handle->internal = menu; handle->internal = menu;
MwLLDetach(handle->lowlevel, point); MwLLDetach(handle->lowlevel, point);
#ifdef _WIN32 #ifdef _WIN32
SetWindowLongPtr(handle->lowlevel->hWnd, GWL_STYLE, (LONG_PTR)0); SetWindowLongPtr(handle->lowlevel->hWnd, GWL_STYLE, (LONG_PTR)0);
SetWindowLongPtr(handle->lowlevel->hWnd, GWL_EXSTYLE, (LONG_PTR)WS_EX_TOOLWINDOW); SetWindowLongPtr(handle->lowlevel->hWnd, GWL_EXSTYLE, (LONG_PTR)WS_EX_TOOLWINDOW);
ShowWindow(handle->lowlevel->hWnd, SW_NORMAL);
SetFocus(handle->lowlevel->hWnd);
#endif #endif
MwLLShow(handle->lowlevel, 1);
for(i = 0; i < arrlen(menu->sub); i++) { for(i = 0; i < arrlen(menu->sub); i++) {
int tw = MwTextWidth(handle, menu->sub[i]->name); int tw = MwTextWidth(handle, menu->sub[i]->name);
h += MwTextHeight(handle, menu->sub[i]->name) + 3; h += MwTextHeight(handle, menu->sub[i]->name) + 3;