From d96b74c1b14b5624d9d032d38210dc5a2034d10f Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Tue, 11 Nov 2025 10:54:49 +0000 Subject: [PATCH] fix for gdi case git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@660 b9cfdab3-6d41-4d17-bbe4-086880011989 --- src/widget/opengl.c | 3 +-- src/widget/scrollbar.c | 8 ++++---- src/widget/submenu.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/widget/opengl.c b/src/widget/opengl.c index 8c40856..e251302 100644 --- a/src/widget/opengl.c +++ b/src/widget/opengl.c @@ -83,8 +83,7 @@ static int create(MwWidget handle) { attribs[3] = 24; attribs[4] = None; - while(glpath[glincr] != NULL && (o->lib = dlopen(glpath[glincr++], RTLD_LAZY)) == NULL) - ; + while(glpath[glincr] != NULL && (o->lib = dlopen(glpath[glincr++], RTLD_LAZY)) == NULL); o->glXChooseVisual = (MWglXChooseVisual)dlsym(o->lib, "glXChooseVisual"); o->glXCreateContext = (MWglXCreateContext)dlsym(o->lib, "glXCreateContext"); diff --git a/src/widget/scrollbar.c b/src/widget/scrollbar.c index c332453..9586af0 100644 --- a/src/widget/scrollbar.c +++ b/src/widget/scrollbar.c @@ -130,7 +130,7 @@ static void draw(MwWidget handle) { } static void mouse_move(MwWidget handle) { - int or = MwGetInteger(handle, MwNorientation); + int or = MwGetInteger(handle, MwNorientation); scrollbar_t* scr = handle->internal; if(!handle->pressed) return; @@ -158,9 +158,9 @@ static void mouse_move(MwWidget handle) { } static void mouse_down(MwWidget handle, void* ptr) { - int ww = MwGetInteger(handle, MwNwidth); - int wh = MwGetInteger(handle, MwNheight); - int or = MwGetInteger(handle, MwNorientation); + int ww = MwGetInteger(handle, MwNwidth); + int wh = MwGetInteger(handle, MwNheight); + int or = MwGetInteger(handle, MwNorientation); scrollbar_t* scr = handle->internal; MwLLMouse* m = ptr; diff --git a/src/widget/submenu.c b/src/widget/submenu.c index 7b9a75b..305fad3 100644 --- a/src/widget/submenu.c +++ b/src/widget/submenu.c @@ -160,6 +160,8 @@ static void mwSubMenuAppearImpl(MwWidget handle, MwMenu menu, MwPoint* point) { handle->internal = menu; + MwLLDetach(handle->lowlevel, point); + #ifdef USE_GDI SetWindowLongPtr(handle->lowlevel->hWnd, GWL_STYLE, (LPARAM)0); SetWindowLongPtr(handle->lowlevel->hWnd, GWL_EXSTYLE, (LPARAM)WS_EX_TOOLWINDOW); @@ -167,8 +169,6 @@ static void mwSubMenuAppearImpl(MwWidget handle, MwMenu menu, MwPoint* point) { MwLLShow(handle->lowlevel, 1); - MwLLDetach(handle->lowlevel, point); - for(i = 0; i < arrlen(menu->sub); i++) { int tw = MwTextWidth(handle, menu->sub[i]->name); h += MwTextHeight(handle, menu->sub[i]->name) + 3;