fix #832

[lyx.git] / src / insets / insetbibitem.C

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index 0bd4e14c0cd1f199d60174912827c456202ff0d7..37372d16769fb8174b855eba6119f6a1bf2afc14 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -17,6 +17,7 @@
 
 #include "frontends/font_metrics.h"
 
+#include "support/tostr.h"
 #include "support/lstrings.h"
 
 
@@ -26,6 +27,7 @@ using std::max;
 int InsetBibitem::key_counter = 0;
 const string key_prefix = "key-";
 
+
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
        : InsetCommand(p), counter(1)
 {
@@ -51,24 +53,38 @@ Inset * InsetBibitem::clone(Buffer const &, bool) const
 
 dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
 {
-       if (cmd.action != LFUN_BIBITEM_APPLY)
-               return UNDISPATCHED;
+       switch (cmd.action) {
 
-       InsetCommandParams p;
-       InsetCommandMailer::string2params(cmd.argument, p);
-       if (p.getCmdName().empty())
-               return UNDISPATCHED;
+       case LFUN_INSET_EDIT:
+               InsetCommandMailer("bibitem", *this).showDialog(cmd.view());
+               return DISPATCHED;
 
-       if (view() && p.getContents() != params().getContents()) {
-               view()->ChangeCitationsIfUnique(params().getContents(),
-                                               p.getContents());
-       }
+       case LFUN_INSET_MODIFY: {
+               InsetCommandParams p;
+               InsetCommandMailer::string2params(cmd.argument, p);
+               if (p.getCmdName().empty())
+                       return DISPATCHED;
+
+               if (view() && p.getContents() != params().getContents()) {
+                       view()->ChangeCitationsIfUnique(params().getContents(),
+                                                       p.getContents());
+               }
 
-       setParams(p);
-       if (view())
-               view()->updateInset(this, true);
+               setParams(p);
+               cmd.view()->updateInset(this);
 
-       return DISPATCHED;
+               // We need to do a redraw because the maximum
+               // InsetBibitem width could have changed
+#warning please check you mean repaint() not update(),
+#warning and whether the repaint() is needed at all
+               cmd.view()->repaint();
+               cmd.view()->fitCursor();
+               return DISPATCHED;
+       }
+
+       default:
+               return InsetCommand::localDispatch(cmd);
+       }
 }
 
 
@@ -120,19 +136,6 @@ string const InsetBibitem::getScreenLabel(Buffer const *) const
 }
 
 
-void InsetBibitem::edit(BufferView *, int, int, mouse_button::state)
-{
-       InsetCommandMailer mailer("bibitem", *this);
-       mailer.showDialog();
-}
-
-
-void InsetBibitem::edit(BufferView * bv, bool)
-{
-       edit(bv, 0, 0, mouse_button::none);
-}
-
-
 // ale070405 This function maybe shouldn't be here. We'll fix this at 0.13.
 int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
 {