Make pinned windows not close on right-click

falbrechtskirchinger · falbrechtskirchinger · commit 4866603cdd59 · 2023-07-27T19:59:05.000+02:00
diff --git a/libs/s25main/WindowManager.cpp b/libs/s25main/WindowManager.cpp
@@ -421,10 +421,12 @@ void WindowManager::Msg_RightDown(const MouseCoords& mc)
         }
         if(foundWindow)
         {
-            // Close it if requested
+            // Close it if requested (unless pinned)
             if(foundWindow->getCloseBehavior() == CloseBehavior::Regular)
-                foundWindow->Close();
-            else
+            {
+                if(!foundWindow->IsPinned())
+                    foundWindow->Close();
+            } else
             {
                 SetActiveWindow(*foundWindow);
                 foundWindow->Msg_RightDown(mc);

Original file line number	Diff line number	Diff line change
`@@ -421,10 +421,12 @@ void WindowManager::Msg_RightDown(const MouseCoords& mc)`
`421`	`421`	`}`
`422`	`422`	`if(foundWindow)`
`423`	`423`	`{`
`424`		`- // Close it if requested`
	`424`	`+ // Close it if requested (unless pinned)`
`425`	`425`	`if(foundWindow->getCloseBehavior() == CloseBehavior::Regular)`
`426`		`- foundWindow->Close();`
`427`		`- else`
	`426`	`+ {`
	`427`	`+ if(!foundWindow->IsPinned())`
	`428`	`+ foundWindow->Close();`
	`429`	`+ } else`
`428`	`430`	`{`
`429`	`431`	`SetActiveWindow(*foundWindow);`
`430`	`432`	`foundWindow->Msg_RightDown(mc);`