use doubles again for x-coordinates. They are needed after all...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7411 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index afa6e1ddf6f1a905509611c37bb10f9a3134f104..818eda8f8694e9e0c829039285fe44c89272e642 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+
+2003-07-28  André Pönitz  <poenitz@gmx.net>
+
+       * lyxtext.h:
+       * text.C:
+       * text2.C:
+       * text3.C: use doubles again for x-coordinates. They are needed.
+
 2003-07-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * messages.C (getLocaleDir): use lyx_localedir()

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 8bc14f870d677709081916148c2ab5b3698a5d97..978d59026bf647e25e881b0f655ee5d13714f0f2 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -494,10 +494,10 @@ public:
 
        /** this calculates the specified parameters. needed when setting
         * the cursor and when creating a visible row */
-       void prepareToPrint(RowList::iterator row, int & x,
-                           int & fill_separator,
-                           int & fill_hfill,
-                           int & fill_label_hfill,
+       void prepareToPrint(RowList::iterator row, double & x,
+                           double & fill_separator,
+                           double & fill_hfill,
+                           double & fill_label_hfill,
                            bool bidi = true) const;
 
 private:

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 86bb5f5eb0180345eaed62de1746a6a8788c9b21..4357cfb27199cda5014a3bd6354022cfe826dda5 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -75,7 +75,7 @@ private:
        void paintChangeBar();
        void paintFirst();
        void paintLast();
-       void paintForeignMark(int orig_x, LyXFont const & orig_font);
+       void paintForeignMark(double orig_x, LyXFont const & orig_font);
        void paintHebrewComposeChar(lyx::pos_type & vpos);
        void paintArabicComposeChar(lyx::pos_type & vpos);
        void paintChars(lyx::pos_type & vpos, bool hebrew, bool arabic);
@@ -117,16 +117,17 @@ private:
        mutable ParagraphList::iterator  pit_;
 
        // Looks ugly - is
-       int xo_;
+       double xo_;
        int yo_;
-       int x_;
+       double x_;
        int y_;
        int width_;
-       int separator_;
-       int hfill_;
-       int label_hfill_;
+       double separator_;
+       double hfill_;
+       double label_hfill_;
 };
 
+
 RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
      RowList::iterator rit,
      int y_offset, int x_offset, int y)
@@ -181,7 +182,6 @@ void RowPainter::paintInset(pos_type const pos)
 
        PainterInfo pi(perv(bv_));
        pi.base.font = getFont(pos);
-#warning metrics?
        inset->draw(pi, int(x_), yo_ + row_->baseline());
        x_ += inset->width();
 }
@@ -313,7 +313,7 @@ void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
 }
 
 
-void RowPainter::paintForeignMark(int orig_x, LyXFont const & orig_font)
+void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
 {
        if (!lyxrc.mark_foreign_language)
                return;
@@ -333,7 +333,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
        LyXFont const & orig_font = getFont(pos);
 
-       int const orig_x = x_;
+       double const orig_x = x_;
 
        char const c = pit_->getChar(pos);
 
@@ -372,7 +372,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
 
 void RowPainter::paintBackground()
 {
-       int const x = xo_;
+       int const x = int(xo_);
        int const y = yo_ < 0 ? 0 : yo_;
        int const h = yo_ < 0 ? row_->height() + yo_ : row_->height();
        pain_.fillRectangle(x, y, width_, h, text_.backgroundColor());
@@ -399,45 +399,46 @@ void RowPainter::paintSelection()
 
                if (startrow == row_ && endrow == row_) {
                        if (startx < endx) {
-                               x = xo_ + startx;
+                               x = int(xo_) + startx;
                                w = endx - startx;
                                pain_.fillRectangle(x, y, w, h, LColor::selection);
                        } else {
-                               x = xo_ + endx;
+                               x = int(xo_) + endx;
                                w = startx - endx;
                                pain_.fillRectangle(x, y, w, h, LColor::selection);
                        }
                } else if (startrow == row_) {
-                       int const x = (is_rtl) ? xo_ : (xo_ + startx);
-                       int const w = (is_rtl) ? startx : (width_ - startx);
+                       int const x = is_rtl ? int(xo_) : int(xo_ + startx);
+                       int const w = is_rtl ? startx : (width_ - startx);
                        pain_.fillRectangle(x, y, w, h, LColor::selection);
                } else if (endrow == row_) {
-                       int const x = (is_rtl) ? (xo_ + endx) : xo_;
-                       int const w = (is_rtl) ? (width_ - endx) : endx;
+                       int const x = is_rtl ? int(xo_ + endx) : int(xo_);
+                       int const w = is_rtl ? (width_ - endx) : endx;
                        pain_.fillRectangle(x, y, w, h, LColor::selection);
                } else if (y_ > starty && y_ < endy) {
-                       pain_.fillRectangle(xo_, y, width_, h, LColor::selection);
+                       pain_.fillRectangle(int(xo_), y, width_, h, LColor::selection);
                }
                return;
        } else if (startrow != row_ && endrow != row_) {
                if (y_ > starty && y_ < endy) {
                        int w = width_;
                        int h = row_->height();
-                       pain_.fillRectangle(xo_, yo_, w, h, LColor::selection);
+                       pain_.fillRectangle(int(xo_), yo_, w, h, LColor::selection);
                }
                return;
        }
 
        if ((startrow != row_ && !is_rtl) || (endrow != row_ && is_rtl))
-               pain_.fillRectangle(xo_, yo_, int(x_), row_->height(), LColor::selection);
+               pain_.fillRectangle(int(xo_), yo_,
+                       int(x_), row_->height(), LColor::selection);
 
        pos_type const body_pos = pit_->beginningOfBody();
        pos_type const last = lastPrintablePos(text_, row_);
-       int tmpx = x_;
+       double tmpx = x_;
 
        for (pos_type vpos = row_->pos(); vpos <= last; ++vpos)  {
                pos_type pos = text_.vis2log(vpos);
-               int const old_tmpx = tmpx;
+               double const old_tmpx = tmpx;
                if (body_pos > 0 && pos == body_pos - 1) {
                        LyXLayout_ptr const & layout = pit_->layout();
                        LyXFont const lfont = getLabelFont();
@@ -474,7 +475,7 @@ void RowPainter::paintSelection()
        }
 
        if ((startrow != row_ && is_rtl) || (endrow != row_ && !is_rtl)) {
-               pain_.fillRectangle(xo_ + int(tmpx),
+               pain_.fillRectangle(int(xo_ + tmpx),
                                      yo_, int(bv_.workWidth() - tmpx),
                                      row_->height(), LColor::selection);
        }
@@ -532,7 +533,8 @@ void RowPainter::paintDepthBar()
                next_depth = next_row->par()->getDepth();
 
        for (Paragraph::depth_type i = 1; i <= depth; ++i) {
-               int x = (PAPER_MARGIN / 5) * i + xo_;
+               int const w = PAPER_MARGIN / 5;
+               int x = int(w * i + xo_);
                // only consider the changebar space if we're drawing outer left
                if (!xo_)
                        x += CHANGEBAR_MARGIN;
@@ -540,14 +542,10 @@ void RowPainter::paintDepthBar()
 
                pain_.line(x, yo_, x, h, LColor::depthbar);
 
-               int const w = PAPER_MARGIN / 5;
-
-               if (i > prev_depth) {
+               if (i > prev_depth)
                        pain_.fillRectangle(x, yo_, w, 2, LColor::depthbar);
-               }
-               if (i > next_depth) {
+               if (i > next_depth)
                        pain_.fillRectangle(x, h, w, 2, LColor::depthbar);
-               }
        }
 }
 
@@ -583,7 +581,7 @@ int RowPainter::paintLengthMarker(string const & prefix, VSpace const & vsp, int
                by2 = added ? end : (end - arrow_size);
        }
 
-       int const leftx = xo_ + leftMargin();
+       int const leftx = int(xo_) + leftMargin();
        int const midx = leftx + arrow_size;
        int const rightx = midx + arrow_size;
 
@@ -625,14 +623,14 @@ int RowPainter::paintPageBreak(string const & label, int y)
        int d = 0;
        font_metrics::rectText(label, pb_font, w, a, d);
 
-       int const text_start = xo_ + ((width_ - w) / 2);
+       int const text_start = int(xo_ + (width_ - w) / 2);
        int const text_end = text_start + w;
 
        pain_.rectText(text_start, y + d, label, pb_font);
 
-       pain_.line(xo_, y, text_start, y,
+       pain_.line(int(xo_), y, text_start, y,
                LColor::pagebreak, Painter::line_onoffdash);
-       pain_.line(text_end, y, xo_ + width_, y,
+       pain_.line(text_end, y, int(xo_ + width_), y,
                LColor::pagebreak, Painter::line_onoffdash);
 
        return 3 * defaultRowHeight();
@@ -650,13 +648,13 @@ int RowPainter::paintAppendixStart(int y)
        int d = 0;
        font_metrics::rectText(label, pb_font, w, a, d);
 
-       int const text_start = xo_ + ((width_ - w) / 2);
+       int const text_start = int(xo_ + (width_ - w) / 2);
        int const text_end = text_start + w;
 
        pain_.rectText(text_start, y + d, label, pb_font);
 
-       pain_.line(xo_ + 1, y, text_start, y, LColor::appendix);
-       pain_.line(text_end, y, xo_ + width_ - 2, y, LColor::appendix);
+       pain_.line(int(xo_ + 1), y, text_start, y, LColor::appendix);
+       pain_.line(text_end, y, int(xo_ + width_ - 2), y, LColor::appendix);
 
        return 3 * defaultRowHeight();
 }
@@ -669,19 +667,17 @@ void RowPainter::paintFirst()
        int y_top = 0;
 
        // start of appendix?
-       if (parparams.startOfAppendix()) {
+       if (parparams.startOfAppendix())
                y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
-       }
 
        // the top margin
        if (row_ == text_.rows().begin() && !text_.isInInset())
                y_top += PAPER_MARGIN;
 
        // draw a top pagebreak
-       if (parparams.pagebreakTop()) {
+       if (parparams.pagebreakTop())
                y_top += paintPageBreak(_("Page Break (top)"),
                        yo_ + y_top + 2 * defaultRowHeight());
-       }
 
        // draw the additional space if needed:
        y_top += paintLengthMarker(_("Space above"), parparams.spaceTop(),
@@ -735,7 +731,7 @@ void RowPainter::paintFirst()
 
                LyXFont font = getLabelFont();
                if (!pit_->getLabelstring().empty()) {
-                       int x = x_;
+                       double x = x_;
                        string const str = pit_->getLabelstring();
 
                        // this is special code for the chapter layout. This is
@@ -759,7 +755,7 @@ void RowPainter::paintFirst()
                                                        font_metrics::width(str, font);
                                        }
 
-                                       pain_.text(x,
+                                       pain_.text(int(x),
                                                yo_ + row_->baseline() -
                                                row_->ascent_of_text() - maxdesc,
                                                str, font);
@@ -773,7 +769,7 @@ void RowPainter::paintFirst()
                                                - font_metrics::width(str, font);
                                }
 
-                               pain_.text(x, yo_ + row_->baseline(), str, font);
+                               pain_.text(int(x), yo_ + row_->baseline(), str, font);
                        }
                }
 
@@ -797,7 +793,7 @@ void RowPainter::paintFirst()
                                int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
                                + (layout->labelbottomsep * defaultRowHeight()));
 
-                       int x = x_;
+                       double x = x_;
                        if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
                                x = ((is_rtl ? leftMargin() : x_)
                                         + ww - text_.rightMargin(*bv_.buffer(), *row_)) / 2;
@@ -806,8 +802,8 @@ void RowPainter::paintFirst()
                                x = ww - leftMargin() -
                                        font_metrics::width(str, font);
                        }
-                       pain_.text(x, yo_ + row_->baseline()
-                                 - row_->ascent_of_text() - maxdesc,
+                       pain_.text(int(x),
+                           yo_ + row_->baseline() - row_->ascent_of_text() - maxdesc,
                                  str, font);
                }
        }
@@ -844,7 +840,7 @@ void RowPainter::paintLast()
                y_bottom -= asc;
 
                int const w = text_.isInInset() ? text_.inset_owner->width() : ww;
-               int const xp = static_cast<int>(text_.isInInset() ? xo_ : 0);
+               int const xp = int(text_.isInInset() ? xo_ : 0);
                int const y = yo_ + y_bottom;
                pain_.line(xp, y, xp + w, y, LColor::topline, Painter::line_solid,
                          Painter::line_thick);
@@ -868,21 +864,20 @@ void RowPainter::paintLast()
                if (row_->fill() <= size)
                        x += (size - row_->fill() + 1) * (is_rtl ? -1 : 1);
 
-               if (endlabel == END_LABEL_BOX) {
+               if (endlabel == END_LABEL_BOX)
                        pain_.rectangle(x, y, size, size, LColor::eolmarker);
-               } else {
+               else
                        pain_.fillRectangle(x, y, size, size, LColor::eolmarker);
-               }
                break;
        }
        case END_LABEL_STATIC:
        {
                LyXFont font = getLabelFont();
                string const & str = pit_->layout()->endlabelstring();
-               int const x = is_rtl ?
+               double const x = is_rtl ?
                        x_ - font_metrics::width(str, font)
                        : ww - text_.rightMargin(*bv_.buffer(), *row_) - row_->fill();
-               pain_.text(x, yo_ + row_->baseline(), str, font);
+               pain_.text(int(x), yo_ + row_->baseline(), str, font);
                break;
        }
        case END_LABEL_NO_LABEL:
@@ -896,8 +891,7 @@ void RowPainter::paintText()
        pos_type const last = lastPrintablePos(text_, row_);
        pos_type body_pos = pit_->beginningOfBody();
        if (body_pos > 0 &&
-               (body_pos - 1 > last ||
-               !pit_->isLineSeparator(body_pos - 1))) {
+               (body_pos - 1 > last || !pit_->isLineSeparator(body_pos - 1))) {
                body_pos = 0;
        }
 
@@ -928,7 +922,7 @@ void RowPainter::paintText()
 
                if (is_struckout && !running_strikeout) {
                        running_strikeout = true;
-                       last_strikeout_x = x_;
+                       last_strikeout_x = int(x_);
                }
 
                bool const highly_editable_inset = pit_->isInset(pos)
@@ -938,8 +932,8 @@ void RowPainter::paintText()
                // we also don't paint across things like tables
                if (running_strikeout && (highly_editable_inset || !is_struckout)) {
                        int const middle = yo_ + row_->top_of_text()
-                               + ((row_->baseline() - row_->top_of_text()) / 2);
-                       pain_.line(last_strikeout_x, middle, x_, middle,
+                               + (row_->baseline() - row_->top_of_text()) / 2;
+                       pain_.line(last_strikeout_x, middle, int(x_), middle,
                                LColor::strikeout, Painter::line_solid, Painter::line_thin);
                        running_strikeout = false;
                }
@@ -957,24 +951,23 @@ void RowPainter::paintText()
                        int const y0 = yo_ + row_->baseline();
                        int const y1 = y0 - defaultRowHeight() / 2;
 
-                       pain_.line(x_, y1, x_, y0, LColor::added_space);
+                       pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
 
                        if (hfillExpansion(text_, row_, pos)) {
                                int const y2 = (y0 + y1) / 2;
 
                                if (pos >= body_pos) {
-                                       pain_.line(x_, y2, x_ + hfill_, y2,
+                                       pain_.line(int(x_), y2, int(x_ + hfill_), y2,
                                                  LColor::added_space,
                                                  Painter::line_onoffdash);
                                        x_ += hfill_;
                                } else {
-                                       pain_.line(x_, y2,
-                                                 x_ + label_hfill_, y2,
+                                       pain_.line(int(x_), y2, int(x_ + label_hfill_), y2,
                                                  LColor::added_space,
                                                  Painter::line_onoffdash);
                                        x_ += label_hfill_;
                                }
-                               pain_.line(x_, y1, x_, y0, LColor::added_space);
+                               pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
                        }
                        x_ += 2;
                        ++vpos;
@@ -992,11 +985,10 @@ void RowPainter::paintText()
        if (running_strikeout) {
                int const middle = yo_ + row_->top_of_text()
                        + ((row_->baseline() - row_->top_of_text()) / 2);
-               pain_.line(last_strikeout_x, middle, x_, middle,
+               pain_.line(last_strikeout_x, middle, int(x_), middle,
                        LColor::strikeout, Painter::line_solid, Painter::line_thin);
                running_strikeout = false;
        }
-       return;
 }
 
 
@@ -1019,9 +1011,8 @@ void RowPainter::paint()
                paintBackground();
 
        // paint the selection background
-       if (text_.selection.set()) {
+       if (text_.selection.set())
                paintSelection();
-       }
 
        // vertical lines for appendix
        paintAppendix();
@@ -1032,13 +1023,11 @@ void RowPainter::paint()
        // changebar
        paintChangeBar();
 
-       if (row_->isParStart()) {
+       if (row_->isParStart())
                paintFirst();
-       }
 
-       if (isParEnd(text_, row_)) {
+       if (isParEnd(text_, row_))
                paintLast();
-       }
 
        // paint text
        paintText();

diff --git a/src/text.C b/src/text.C
index fd3a31081f8c07bd9cc4368b96cfddf796fb02f2..8cec91518d177d653e6496dc15461c5c339ce53d 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1021,7 +1021,6 @@ int LyXText::fill(RowList::iterator row, int paper_width) const
                        << " w " << w << " paper_width " << paper_width
                        << " right margin " << rightMargin(*bv()->buffer(), *row) << endl;
        }
-
        return fill;
 }
 
@@ -1390,9 +1389,9 @@ void LyXText::setHeightOfRow(RowList::iterator rit)
 
        rit->top_of_text(rit->baseline() - font_metrics::maxAscent(font));
 
-       int x = 0;
+       double x = 0;
        if (layout->margintype != MARGIN_RIGHT_ADDRESS_BOX) {
-               int dummy;
+               double dummy;
                // this IS needed
                rit->width(maxwidth);
                prepareToPrint(rit, x, dummy, dummy, dummy, false);
@@ -1878,13 +1877,13 @@ void LyXText::charInserted()
 }
 
 
-void LyXText::prepareToPrint(RowList::iterator rit, int & x,
-                            int & fill_separator,
-                            int & fill_hfill,
-                            int & fill_label_hfill,
+void LyXText::prepareToPrint(RowList::iterator rit, double & x,
+                            double & fill_separator,
+                            double & fill_hfill,
+                            double & fill_label_hfill,
                             bool bidi) const
 {
-       int w = rit->fill();
+       double w = rit->fill();
        fill_hfill = 0;
        fill_label_hfill = 0;
        fill_separator = 0;
@@ -1916,7 +1915,7 @@ void LyXText::prepareToPrint(RowList::iterator rit, int & x,
                        ++nlh;
 
                if (nlh && !pit->getLabelWidthString().empty()) {
-                       fill_label_hfill = int(labelFill(*rit) / nlh);
+                       fill_label_hfill = labelFill(*rit) / double(nlh);
                }
        }
 

diff --git a/src/text2.C b/src/text2.C
index c5f30869c32aaa8c319f3d0f488f035618f5236b..e5b7120953baa423189deb0f57f699aef4526792 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -1577,10 +1577,10 @@ float LyXText::getCursorX(RowList::iterator rit,
                          pos_type pos, pos_type last, bool boundary) const
 {
        pos_type cursor_vpos = 0;
-       int x;
-       int fill_separator;
-       int fill_hfill;
-       int fill_label_hfill;
+       double x;
+       double fill_separator;
+       double fill_hfill;
+       double fill_label_hfill;
        // This call HAS to be here because of the BidiTables!!!
        prepareToPrint(rit, x, fill_separator, fill_hfill,
                       fill_label_hfill);
@@ -1603,8 +1603,8 @@ float LyXText::getCursorX(RowList::iterator rit,
                        ? log2vis(pos) : log2vis(pos) + 1;
 
        pos_type body_pos = rit_par->beginningOfBody();
-       if ((body_pos > 0) &&
-           ((body_pos - 1 > last) || !rit_par->isLineSeparator(body_pos - 1)))
+       if (body_pos > 0 &&
+           (body_pos - 1 > last || !rit_par->isLineSeparator(body_pos - 1)))
                body_pos = 0;
 
        for (pos_type vpos = rit_pos; vpos < cursor_vpos; ++vpos) {
@@ -1712,10 +1712,10 @@ void LyXText::setCurrentFont()
 pos_type
 LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
 {
-       int tmpx = 0;
-       int fill_separator;
-       int fill_hfill;
-       int fill_label_hfill;
+       double tmpx = 0;
+       double fill_separator;
+       double fill_hfill;
+       double fill_label_hfill;
 
        prepareToPrint(rit, tmpx, fill_separator, fill_hfill, fill_label_hfill);
 
@@ -1729,7 +1729,7 @@ LyXText::getColumnNearX(RowList::iterator rit, int & x, bool & boundary) const
        bool left_side = false;
 
        pos_type body_pos = rit_par->beginningOfBody();
-       int last_tmpx = tmpx;
+       double last_tmpx = tmpx;
 
        if (body_pos > 0 &&
            (body_pos - 1 > last ||