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

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 51dfd0c3c18e82e587461816c5639301c5d368c4..978d59026bf647e25e881b0f655ee5d13714f0f2 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -60,6 +60,8 @@ public:
        LyXFont current_font;
        /// the current font
        LyXFont real_current_font;
+       /// our buffer's default layout font
+       LyXFont defaultfont_;
 private:
        /** the 'anchor' row: the position of this row remains constant
         *  with respect to the top of the screen
@@ -85,16 +87,13 @@ public:
        ///
        int getRealCursorX() const;
        ///
-       LyXFont const getFont(Buffer const *, ParagraphList::iterator pit,
-               lyx::pos_type pos) const;
+       LyXFont getFont(ParagraphList::iterator pit, lyx::pos_type pos) const;
        ///
-       LyXFont const getLayoutFont(Buffer const *,
-                                   ParagraphList::iterator pit) const;
+       LyXFont getLayoutFont(ParagraphList::iterator pit) const;
        ///
-       LyXFont const getLabelFont(Buffer const *,
-                                  ParagraphList::iterator pit) const;
+       LyXFont getLabelFont(ParagraphList::iterator pit) const;
        ///
-       void setCharFont(Buffer const *, ParagraphList::iterator pit,
+       void setCharFont(ParagraphList::iterator pit,
                         lyx::pos_type pos, LyXFont const & font);
        void setCharFont(ParagraphList::iterator pit,
                         lyx::pos_type pos,
@@ -161,16 +160,13 @@ public:
        ///
        void insertInset(InsetOld * inset);
 
-       /// Completes the insertion with a rebreak from 'need_break_row' on
+       /// Completes the insertion with a rebreak
        void partialRebreak();
        /// a full rebreak of the whole text
        void fullRebreak();
        /// compute text metrics
        void metrics(MetricsInfo & mi, Dimension & dim);
 
-       ///
-       RowList::iterator need_break_row;
-
        /// clear any pending paints
        void clearPaint();
 
@@ -423,7 +419,7 @@ private:
        float getCursorX(RowList::iterator rit, lyx::pos_type pos,
                         lyx::pos_type last, bool boundary) const;
        /// used in setlayout
-       void makeFontEntriesLayoutSpecific(Buffer const &, Paragraph & par);
+       void makeFontEntriesLayoutSpecific(BufferParams const &, Paragraph & par);
 
        /** forces the redrawing of a paragraph. Needed when manipulating a
            right address box
@@ -498,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: