>>>>> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:
Georg> Jean-Marc Lasgouttes wrote:
>>>>>>> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]>
>>>>>>> writes:
>>
Juergen> Indeed, it is still possible to trigger the assert. I can do
Juergen> this with double and triple clicking. Probably bug 1797; I
Juergen> guess we need to handle LFUN_MOUSE_{DOUBLE|TRIPLE} in the
Juergen> inset's (or insetcollapsable's) dispatch somehow.
>> I guess that insetcollapsable should handle double/triple click
>> only if it is open and the click is in the insettext. I have not
>> had time to look at this, but it should be easy enough to do.
Georg> I agree. The attached works for me. Please test. If nobody sees
Georg> problems I'll commit that.
Actually, I think we should use exactly the same wording as for the
LFUN_MOUSE_MOTION.
What about the following? (still untested)
JMarc
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.1133
diff -u -p -r1.1133 ChangeLog
--- src/insets/ChangeLog 20 Apr 2005 10:47:14 -0000 1.1133
+++ src/insets/ChangeLog 22 Apr 2005 14:21:24 -0000
@@ -1,3 +1,8 @@
+2005-04-22 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * insetcollapsable.C (doDispatch): do not pass through double/triple
+ click events when they are not in the insetext (bug 1797).
+
2005-04-19 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* insetcollapsable.C (doDispatch): pass through double/triple
Index: src/insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.268
diff -u -p -r1.268 insetcollapsable.C
--- src/insets/insetcollapsable.C 20 Apr 2005 10:47:15 -0000 1.268
+++ src/insets/insetcollapsable.C 22 Apr 2005 14:21:24 -0000
@@ -298,6 +298,8 @@ void InsetCollapsable::doDispatch(LCurso
break;
case LFUN_MOUSE_MOTION:
+ case LFUN_MOUSE_DOUBLE:
+ case LFUN_MOUSE_TRIPLE:
if (status_ == Inlined)
InsetText::doDispatch(cur, cmd);
else if (status_ == Open && !hitButton(cmd))
