[commit] r2063 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep 26 08:53:45 2012
New Revision: 2063

Log:
Make outline in connect mode over ports and FCOs bigger. Make target for port bigger

Modified:
   trunk/GME/Gme/GMEStd.h
   trunk/GME/Gme/GMEView.cpp
   trunk/GME/Gme/GUIObject.cpp

Modified: trunk/GME/Gme/GMEStd.h
==============================================================================
--- trunk/GME/Gme/GMEStd.h	Wed Sep 26 08:53:32 2012	(r2062)
+++ trunk/GME/Gme/GMEStd.h	Wed Sep 26 08:53:45 2012	(r2063)
@@ -67,8 +67,8 @@
 
 
 #define GME_HOTSPOT_RADIUS			10
-#define GME_HOTSPOT_VISUAL_RADIUS	2
-#define GME_CONNSELECT_WIDTH		1
+#define GME_HOTSPOT_VISUAL_RADIUS	3
+#define GME_CONNSELECT_WIDTH		2
 
 
 #define GME_DYN_MENU_MINID			0x1001

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Wed Sep 26 08:53:32 2012	(r2062)
+++ trunk/GME/Gme/GMEView.cpp	Wed Sep 26 08:53:45 2012	(r2063)
@@ -923,7 +923,7 @@
 					rect = connSrcPort->GetLocation() + rect.TopLeft();
 				}
 				Gdiplus::Pen* xorPen = graphics.GetGdipPen2(&gdip, GME_DARKRED_COLOR, GME_LINE_SOLID, m_zoomVal > ZOOM_NO, GME_CONNSELECT_WIDTH);
-				gdip.DrawRectangle(xorPen, rect.left, rect.top, rect.Width(), rect.Height());
+				gdip.DrawRectangle(xorPen, rect.left - .5f, rect.top - .5f, (float)rect.Width(), (float)rect.Height());
 
 				if ((connSrcHotSide != GME_CENTER) && (!connSrcPort)) {
 					CPoint hotSpot;
@@ -956,7 +956,7 @@
 					rect = connTmpPort->GetLocation() + rect.TopLeft();
 				}
 				Gdiplus::Pen* xorPen = graphics.GetGdipPen2(&gdip, GME_RED_COLOR, GME_LINE_SOLID, m_zoomVal > ZOOM_NO, GME_CONNSELECT_WIDTH);
-				gdip.DrawRectangle(xorPen, rect.left, rect.top, rect.Width(), rect.Height());
+				gdip.DrawRectangle(xorPen, rect.left - .5f, rect.top - .5f, (float) rect.Width(), (float) rect.Height());
 
 				if ((connTmpHotSide != GME_CENTER) && (!connTmpPort)) {
 					CPoint hotSpot;

Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp	Wed Sep 26 08:53:32 2012	(r2062)
+++ trunk/GME/Gme/GUIObject.cpp	Wed Sep 26 08:53:45 2012	(r2063)
@@ -1555,9 +1555,10 @@
 		if (!mgaFco.IsEqualObject(port->mgaFco))
 		{
 			CRect r = port->GetLocation() + GetLocation().TopLeft();
+			r.InflateRect(1, 1); // consider mouseover on red outline too
 			CRect rInflated = r;
 			rInflated.InflateRect(3, 3);
-			if (r.PtInRect(pt) == TRUE || lookNearToo && rInflated.PtInRect(pt) == TRUE)
+			if (r.PtInRect(pt) == TRUE || (lookNearToo && rInflated.PtInRect(pt) == TRUE))
 			{
 				CSize psize = port->GetLocation().Size();
 				if (found)