[OMPT-svn-commit] OpenMPT r22179 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Wed Nov 13 21:20:48 2024
New Revision: 22179
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22179

Log:
Merged revision(s) 22177-22178 from trunk/OpenMPT:
[Fix] Don't limit update tooltip horizontal position to right border of main window if the toolbar is floating.
........
[Fix] Pass the correct rect to update tooltip. Doesn't appear to make a difference in practice.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/Mainbar.cpp

Modified: branches/OpenMPT-1.31/mptrack/Mainbar.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Mainbar.cpp	Wed Nov 13 21:20:21 2024	(r22178)
+++ branches/OpenMPT-1.31/mptrack/Mainbar.cpp	Wed Nov 13 21:20:48 2024	(r22179)
@@ -474,8 +474,12 @@
 	GetToolBarCtrl().GetRect(ID_UPDATE_AVAILABLE, &rect);
 	CPoint pt = rect.CenterPoint();
 	ClientToScreen(&pt);
-	CMainFrame::GetMainFrame()->GetWindowRect(rect);
-	LimitMax(pt.x, rect.right);
+	if(!IsFloating())
+	{
+		CRect windowRect;
+		CMainFrame::GetMainFrame()->GetWindowRect(windowRect);
+		LimitMax(pt.x, windowRect.right);
+	}
 
 	return m_tooltip.ShowUpdate(*this, newVersion, infoURL, rect, pt, ID_UPDATE_AVAILABLE);
 }