move inset related stuff from src/graphics to src/inset/

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

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index ca3defd7c82c0058d6f07e70270b19bc1f5ae019..00b3e869ec6c3ce989ecb5b63d41ecf05bcfa110 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -18,10 +18,10 @@
 #include "gettext.h"
 #include "lyxfont.h"
 #include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
 #include "debug.h"
 #include "lyxtext.h"
-#include "font.h"
+#include "frontends/font_metrics.h"
 #include "lyxlex.h"
 
 #include "insets/insettext.h"
@@ -45,7 +45,7 @@ InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
 #if 0
        autocollapse(false),
 #endif
-         oldWidth(0), in_update(false)
+         oldWidth(0), in_update(false), first_after_edit(false)
 {
        inset.setOwner(this);
        inset.setAutoBreakRows(true);
@@ -63,7 +63,7 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id)
 #if 0
          autocollapse(in.autocollapse),
 #endif
-         oldWidth(0), in_update(false)
+         oldWidth(0), in_update(false), first_after_edit(false)
 {
        inset.init(&(in.inset), same_id);
        inset.setOwner(this);
@@ -113,7 +113,7 @@ int InsetCollapsable::ascent_collapsed() const
        int width = 0;
        int ascent = 0;
        int descent = 0;
-       lyxfont::buttonText(label, labelfont, width, ascent, descent);
+       font_metrics::buttonText(label, labelfont, width, ascent, descent);
        return ascent;
 }
 
@@ -123,7 +123,7 @@ int InsetCollapsable::descent_collapsed() const
        int width = 0;
        int ascent = 0;
        int descent = 0;
-       lyxfont::buttonText(label, labelfont, width, ascent, descent);
+       font_metrics::buttonText(label, labelfont, width, ascent, descent);
        return descent;
 }
 
@@ -134,7 +134,7 @@ int InsetCollapsable::width_collapsed() const
        int width;
        int ascent;
        int descent;
-       lyxfont::buttonText(label, labelfont, width, ascent, descent);
+       font_metrics::buttonText(label, labelfont, width, ascent, descent);
        return width + (2*TEXT_TO_INSET_OFFSET);
 }
 
@@ -235,7 +235,7 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
 
 
 void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
-                           unsigned int button)
+                            mouse_button::state button)
 {
        UpdatableInset::edit(bv, xp, yp, button);
 
@@ -276,12 +276,12 @@ void InsetCollapsable::edit(BufferView * bv, bool front)
                inset.setUpdateStatus(bv, InsetText::FULL);
                bv->updateInset(this, false);
                inset.edit(bv, front);
+               first_after_edit = true;
        } else {
                if (!bv->lockInset(this))
                        return;
                inset.edit(bv, front);
        }
-       first_after_edit = true;
 }
 
 
@@ -313,7 +313,7 @@ void InsetCollapsable::insetUnlock(BufferView * bv)
 
 
 void InsetCollapsable::insetButtonPress(BufferView * bv,
-                                       int x, int y, int button)
+       int x, int y, mouse_button::state button)
 {
        if (!collapsed_ && (y > button_bottom_y)) {
                LyXFont font(LyXFont::ALL_SANE);
@@ -327,10 +327,10 @@ void InsetCollapsable::insetButtonPress(BufferView * bv,
 
 
 bool InsetCollapsable::insetButtonRelease(BufferView * bv,
-                                         int x, int y, int button)
+       int x, int y, mouse_button::state button)
 {
        bool ret = false;
-       if ((button != 3) && (x >= 0)  && (x < button_length) &&
+       if ((button != mouse_button::button3) && (x < button_length) &&
            (y >= button_top_y) &&  (y <= button_bottom_y))
        {
                if (collapsed_) {
@@ -352,15 +352,15 @@ bool InsetCollapsable::insetButtonRelease(BufferView * bv,
                     inset.ascent(bv, font));
                ret = inset.insetButtonRelease(bv, x, yy, button);
        }
-       if ((button == 3) && !ret) {
+       if ((button == mouse_button::button3) && !ret) {
                return showInsetDialog(bv);
        }
-       return false;
+       return ret;
 }
 
 
 void InsetCollapsable::insetMotionNotify(BufferView * bv,
-                                        int x, int y, int state)
+       int x, int y, mouse_button::state state)
 {
        if (y > button_bottom_y) {
                LyXFont font(LyXFont::ALL_SANE);
@@ -373,12 +373,6 @@ void InsetCollapsable::insetMotionNotify(BufferView * bv,
 }
 
 
-void InsetCollapsable::insetKeyPress(XKeyEvent * xke)
-{
-       inset.insetKeyPress(xke);
-}
-
-
 int InsetCollapsable::latex(Buffer const * buf, ostream & os,
                            bool fragile, bool free_spc) const
 {