Author: toshok
Date: 2008-01-23 20:58:43 -0500 (Wed, 23 Jan 2008)
New Revision: 93759
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/runtime.cpp
Log:
2008-01-23 Chris Toshok <[EMAIL PROTECTED]>
* runtime.cpp (Surface::SetMouseCapture): this fails not only if
there's an existing capture, but also if there's a pending
capture (so if both a parent and child capture on the same event,
the child gets it.) Fixes dragging things around in ink journal.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2008-01-24 01:58:22 UTC (rev 93758)
+++ trunk/moon/src/ChangeLog 2008-01-24 01:58:43 UTC (rev 93759)
@@ -1,5 +1,12 @@
2008-01-23 Chris Toshok <[EMAIL PROTECTED]>
+ * runtime.cpp (Surface::SetMouseCapture): this fails not only if
+ there's an existing capture, but also if there's a pending
+ capture (so if both a parent and child capture on the same event,
+ the child gets it.) Fixes dragging things around in ink journal.
+
+2008-01-23 Chris Toshok <[EMAIL PROTECTED]>
+
* stylus.cpp, stylus.h: initial hit testing stuff. right now the
only tests that are implemented are endcap (ellipse) vs. point,
and segment vs. segment (although this one isn't the full test, as
Modified: trunk/moon/src/runtime.cpp
===================================================================
--- trunk/moon/src/runtime.cpp 2008-01-24 01:58:22 UTC (rev 93758)
+++ trunk/moon/src/runtime.cpp 2008-01-24 01:58:43 UTC (rev 93759)
@@ -1018,7 +1018,7 @@
bool
Surface::SetMouseCapture (UIElement *capture)
{
- if (capture != NULL && captured)
+ if (capture != NULL && (captured || pendingCapture))
return false;
// we delay the actual capture/release until the end of the
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
