ws changes only

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

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 8c8f732c588e1ec3074da680e807d5b617bd6d34..e9c584aea057b6a8c2d236cce4a2252fffc057b8 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -9,17 +9,16 @@
  */
 #include <config.h>
 
-
-#include "gettext.h"
 #include "insettoc.h"
+
 #include "funcrequest.h"
-#include "BufferView.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "debug.h"
+#include "gettext.h"
+#include "metricsinfo.h"
 #include "toc.h"
 
-using std::vector;
+#include "support/std_ostream.h"
+
+using std::string;
 using std::ostream;
 
 
@@ -35,7 +34,7 @@ InsetTOC::~InsetTOC()
 }
 
 
-string const InsetTOC::getScreenLabel(Buffer const *) const
+string const InsetTOC::getScreenLabel(Buffer const &) const
 {
        string const cmdname(getCmdName());
 
@@ -57,7 +56,10 @@ InsetOld::Code InsetTOC::lyxCode() const
 void InsetTOC::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        InsetCommand::metrics(mi, dim);
-       center_indent_ = (mi.base.textwidth - dim.wid) / 2;
+       int center_indent = (mi.base.textwidth - dim.wid) / 2;
+       Box b(center_indent, center_indent + dim.wid, -dim.asc, dim.des);
+       button().setBox(b);
+
        dim.wid = mi.base.textwidth;
        dim_ = dim;
 }
@@ -65,23 +67,29 @@ void InsetTOC::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetTOC::draw(PainterInfo & pi, int x, int y) const
 {
-       InsetCommand::draw(pi, x + center_indent_, y);
+       InsetCommand::draw(pi, x + button().box().x1, y);
 }
 
 
 dispatch_result InsetTOC::localDispatch(FuncRequest const & cmd)
 {
        switch (cmd.action) {
-       case LFUN_INSET_EDIT:
+       case LFUN_MOUSE_RELEASE:
+               if (button().box().contains(cmd.x, cmd.y))
+                       InsetCommandMailer("toc", *this).showDialog(cmd.view());
+               return DISPATCHED;
+
+       case LFUN_INSET_DIALOG_SHOW:
                InsetCommandMailer("toc", *this).showDialog(cmd.view());
                return DISPATCHED;
+
        default:
                return InsetCommand::localDispatch(cmd);
        }
 }
 
 
-int InsetTOC::ascii(Buffer const * buffer, ostream & os, int) const
+int InsetTOC::ascii(Buffer const & buffer, ostream & os, int) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
@@ -92,7 +100,7 @@ int InsetTOC::ascii(Buffer const * buffer, ostream & os, int) const
 }
 
 
-int InsetTOC::linuxdoc(Buffer const *, ostream & os) const
+int InsetTOC::linuxdoc(Buffer const &, ostream & os) const
 {
        if (getCmdName() == "tableofcontents")
                os << "<toc>";
@@ -100,7 +108,7 @@ int InsetTOC::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetTOC::docbook(Buffer const *, ostream & os, bool) const
+int InsetTOC::docbook(Buffer const &, ostream & os, bool) const
 {
        if (getCmdName() == "tableofcontents")
                os << "<toc></toc>";