* ANNOUNCE

[lyx.git] / src / insets / InsetLine.cpp

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index f9b4662e57cd7aea9c993939059350bcb5a9d64d..5c12d37e09539a23430ffc21be0020fd3d4eaf9d 100644 (file)
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -3,6 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
+ * \author Abdelrazak Younes
  * \author André Pönitz
  * \author Uwe Stöhr
  *
@@ -14,6 +15,7 @@
 #include "InsetLine.h"
 
 #include "Buffer.h"
+#include "Cursor.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
@@ -41,7 +43,7 @@ using frontend::Painter;
 
 
 InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "line")
+       : InsetCommand(buf, p)
 {}
 
 
@@ -70,8 +72,7 @@ void InsetLine::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(LINE_CODE);
                // FIXME UNICODE
-               InsetCommand::string2params("line",
-                       to_utf8(cmd.argument()), p);
+               InsetCommand::string2params(to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noScreenUpdate();
                        break;
@@ -104,8 +105,6 @@ bool InsetLine::getStatus(Cursor & cur, FuncRequest const & cmd,
 void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
-       dim.asc = fm.maxAscent();
-       dim.des = fm.maxDescent();
        int const max_width = mi.base.textwidth;
 
        Length const width(to_ascii(getParam("width")));
@@ -120,6 +119,16 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
        int const minw = (dim.wid < 0) ? 24 : 4;
        dim.wid = max(minw, max(dim.wid, -dim.wid));
 
+       Length height = Length(to_ascii(getParam("height")));
+       height_ = height.inPixels(dim.height(), fm.width(char_type('M')));
+
+       // get the length of the parameters in pixels
+       Length offset = Length(to_ascii(getParam("offset")));
+       offset_ = offset.inPixels(max_width, fm.width(char_type('M')));
+
+       dim.asc = max(fm.maxAscent(), offset_ + height_);
+       dim.des = max(fm.maxDescent(), - offset_);
+
        // Cache the inset dimension
        setDimCache(mi, dim);
 }
@@ -136,27 +145,18 @@ Dimension const InsetLine::dimension(BufferView const & bv) const
 void InsetLine::draw(PainterInfo & pi, int x, int y) const
 {
        Dimension const dim = dimension(*pi.base.bv);
-       int const max_width = dim.width();
-
-       frontend::FontMetrics const & fm = theFontMetrics(pi.base.font);
-
-       Length height = Length(to_ascii(getParam("height")));
-       int const h = height.inPixels(dim.height(), fm.width(char_type('M')));
-
-       // get the length of the parameters in pixels
-       Length offset = Length(to_ascii(getParam("offset")));
-       int o = offset.inPixels(max_width, fm.width(char_type('M')));
-
-       // check that it doesn't exceed the upper boundary
-       if (y - o - h/2 < 0)
-               o = y - h/2 - 2;
 
        // get the surrounding text color
        Color Line_color = pi.base.font.realColor();
 
        // the offset is a vertical one
-       pi.pain.line(x + 1, y - o - h/2, x + dim.wid - 2, y - o - h/2,
-               Line_color, Painter::line_solid, float(h));
+       // the horizontal dimension must be corrected with the heigth because
+       // of left and right border of the painted line for big heigth.
+       pi.pain.line(x + height_/2 + 1,
+                    y - offset_ - height_/2,
+                    x + dim.wid - height_/2 - 2,
+                    y - offset_ - height_/2,
+                    Line_color, Painter::line_solid, float(height_));
 }