fixed dock context window

KeithDHedger · KeithDHedger · commit 57ad27cd398e · 2024-12-27T14:36:57.000Z
diff --git a/LFSDock/LFSDock/src/callbacks.cpp b/LFSDock/LFSDock/src/callbacks.cpp
@@ -145,12 +145,15 @@ void showhidetActionList(LFSTK_gadgetClass *bc,LFSTK_windowClass *winc,LFSTK_lis
 			winc->LFSTK_showWindow(true);
 			winc->LFSTK_setKeepAbove(true);
 			winc->LFSTK_redrawAllGadgets();
+			//dockWindow->ignoreContext=true;//TODO//
+			dockWindow->LFSTK_setContextWindow(NULL);
 			apc->windows->at(apc->LFSTK_findWindow(winc)).showing=true;
 		}
 	else
 		{
 			winc->LFSTK_hideWindow();
 			apc->windows->at(apc->LFSTK_findWindow(winc)).showing=false;
+			dockWindow->LFSTK_setContextWindow(mainContextWindow);
 		}
 }
 
diff --git a/LFSDock/LFSDock/src/globals.h b/LFSDock/LFSDock/src/globals.h
@@ -118,8 +118,7 @@ extern LFSTK_windowClass			*iconWindow;
 extern int						holdpsize;
 extern bool						dockIsHidden;
 
-extern LFSTK_windowClass		*mainContextWindow;
-
+extern LFSTK_windowClass			*mainContextWindow;
 extern LFSTK_windowClass			*popActionWindow;
 extern LFSTK_listGadgetClass		*popActionList;
 extern bool						inSomeWindow;
diff --git a/LFSToolKit/examples/window.cpp b/LFSToolKit/examples/window.cpp
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
 		}
 	contextWindow->LFSTK_resizeWindow(GADGETWIDTH,sy,true);
 	wc->LFSTK_setContextWindow(contextWindow);
-	wc->contextWindowPos=CONTEXTBELOW;
+	wc->contextWindowPos=CONTEXTATMOUSE;
 	//wc->contextYOffset=-40;
 	printf("Number of gadgets in window=%i\n",wc->LFSTK_gadgetCount());
 	int retval=apc->LFSTK_runApp();

Original file line number	Diff line number	Diff line change
`@@ -145,12 +145,15 @@ void showhidetActionList(LFSTK_gadgetClass bc,LFSTK_windowClass winc,LFSTK_lis`
`145`	`145`	`winc->LFSTK_showWindow(true);`
`146`	`146`	`winc->LFSTK_setKeepAbove(true);`
`147`	`147`	`winc->LFSTK_redrawAllGadgets();`
	`148`	`+ //dockWindow->ignoreContext=true;//TODO//`
	`149`	`+ dockWindow->LFSTK_setContextWindow(NULL);`
`148`	`150`	`apc->windows->at(apc->LFSTK_findWindow(winc)).showing=true;`
`149`	`151`	`}`
`150`	`152`	`else`
`151`	`153`	`{`
`152`	`154`	`winc->LFSTK_hideWindow();`
`153`	`155`	`apc->windows->at(apc->LFSTK_findWindow(winc)).showing=false;`
	`156`	`+ dockWindow->LFSTK_setContextWindow(mainContextWindow);`
`154`	`157`	`}`
`155`	`158`	`}`
`156`	`159`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ int main(int argc, char **argv)`
`121`	`121`	`}`
`122`	`122`	`contextWindow->LFSTK_resizeWindow(GADGETWIDTH,sy,true);`
`123`	`123`	`wc->LFSTK_setContextWindow(contextWindow);`
`124`		`- wc->contextWindowPos=CONTEXTBELOW;`
	`124`	`+ wc->contextWindowPos=CONTEXTATMOUSE;`
`125`	`125`	`//wc->contextYOffset=-40;`
`126`	`126`	`printf("Number of gadgets in window=%i\n",wc->LFSTK_gadgetCount());`
`127`	`127`	`int retval=apc->LFSTK_runApp();`