]> git.lyx.org Git - features.git/commitdiff
Restore some sanaity in InsetInfo lfuns (bug #6580)
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Tue, 9 Mar 2010 23:04:35 +0000 (23:04 +0000)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Tue, 9 Mar 2010 23:04:35 +0000 (23:04 +0000)
The context menu is wrong, I do not know why.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33689 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/InsetInfo.cpp

index 05de0309578c7c956fc724d0c4bf03f11a7f3791..ce52ce8a629b34751e404532798a22feb8aabe91 100644 (file)
@@ -193,20 +193,20 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
-       case LFUN_MOUSE_PRESS:
-       case LFUN_MOUSE_RELEASE:
-       case LFUN_MOUSE_MOTION:
-       case LFUN_MOUSE_DOUBLE:
-       case LFUN_MOUSE_TRIPLE:
-       case LFUN_COPY:
        case LFUN_INSET_SETTINGS:
                return InsetCollapsable::getStatus(cur, cmd, flag);
-
+               
        case LFUN_INSET_DIALOG_UPDATE:
-       case LFUN_INSET_MODIFY:
                flag.setEnabled(true);
                return true;
-
+               
+       case LFUN_INSET_MODIFY:
+               if (validateModifyArgument(cmd.argument())) {
+                       flag.setEnabled(true);
+                       return true;
+               }
+               //fall back
+               
        default:
                return false;
        }
@@ -217,19 +217,12 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        // allow selection, copy but not cut, delete etc
        switch (cmd.action) {
-       case LFUN_MOUSE_PRESS:
-       case LFUN_MOUSE_RELEASE:
-       case LFUN_MOUSE_MOTION:
-       case LFUN_MOUSE_DOUBLE:
-       case LFUN_MOUSE_TRIPLE:
-       case LFUN_COPY:
        case LFUN_INSET_SETTINGS:
                InsetCollapsable::doDispatch(cur, cmd);
                break;
 
        case LFUN_INSET_MODIFY:
                setInfo(to_utf8(cmd.argument()));
-               cur.pos() = 0;
                break;
 
        default: