improve resize flash operation, fixup xv grab/ungrab, fixup label updates

[goodguy/history.git] / cinelerra-5.1 / cinelerra / keyframepopup.C

diff --git a/cinelerra-5.1/cinelerra/keyframepopup.C b/cinelerra-5.1/cinelerra/keyframepopup.C
index 45fdb127590a576257423ef85dc8551b99ae320b..6d2c7370e751ee0abfe8b749794891a00696244e 100644 (file)
--- a/cinelerra-5.1/cinelerra/keyframepopup.C
+++ b/cinelerra-5.1/cinelerra/keyframepopup.C
@@ -127,12 +127,13 @@ void KeyframePopup::handle_curve_mode(Autos *autos, Auto *auto_keyframe)
 // determines the type of automation node. if floatauto, adds
 // menu entries showing the curve mode of the node
 {
+       deactivate();
        if( !key_edit_displayed && keyframe_plugin ) {
                add_item(key_edit);
                key_edit_displayed = true;
        }
        else if( key_edit_displayed && !keyframe_plugin ) {
-               remove_item(key_mbar);
+               remove_item(key_edit);
                key_edit_displayed = false;
        }
 
@@ -161,6 +162,7 @@ void KeyframePopup::handle_curve_mode(Autos *autos, Auto *auto_keyframe)
                key_free_t->toggle_mode((FloatAuto*)auto_keyframe);
                key_free  ->toggle_mode((FloatAuto*)auto_keyframe);
        }
+       activate();
 }
 
 KeyframePopupDelete::KeyframePopupDelete(MWindow *mwindow, KeyframePopup *popup)
@@ -437,7 +439,7 @@ const char* KeyframePopupCurveMode::get_labeltext(int mode)
        case FloatAuto::TFREE:  return _("tangent edit");
        case FloatAuto::FREE:   return _("disjoint edit");
        }
-       return "misconfigured";
+       return _("misconfigured");
 }