Fix horizontal scrolling in full-width collapsable insets

[lyx.git] / src / FontList.h

diff --git a/src/FontList.h b/src/FontList.h
index 582848b5c95a1dcc4ac3c9f4b18b6273e8434c42..9dfd5274269f1f6036d20f8b6c4ba588cef36b6e 100644 (file)
--- a/src/FontList.h
+++ b/src/FontList.h
@@ -56,7 +56,7 @@ private:
        paragraph or, in the case of nested paragraphs, from the
        layout in the environment one level up until completely
        resolved.
        paragraph or, in the case of nested paragraphs, from the
        layout in the environment one level up until completely
        resolved.

-       The values Font::IGNORE_* and Font::TOGGLE are NOT
+       The values Font::IGNORE_* and FONT_TOGGLE are NOT

        allowed in these font tables.
        */
        Font font_;
        allowed in these font tables.
        */
        Font font_;


@@ -84,13 +84,15 @@ public:
        ///
        bool empty() const { return list_.empty(); }
        ///
        ///
        bool empty() const { return list_.empty(); }
        ///

+       void clear() { list_.clear(); }
+       ///

        void erase(pos_type pos);
        ///
        iterator fontIterator(pos_type pos);
        ///
        const_iterator fontIterator(pos_type pos) const;
        ///
        void erase(pos_type pos);
        ///
        iterator fontIterator(pos_type pos);
        ///
        const_iterator fontIterator(pos_type pos) const;
        ///

-       Font & get(pos_type pos);
+       Font const & get(pos_type pos);

        ///
        void set(pos_type pos, Font const & font);
        ///
        ///
        void set(pos_type pos, Font const & font);
        ///


@@ -104,16 +106,10 @@ public:
        void decreasePosAfterPos(pos_type pos);
 
        /// Returns the height of the highest font in range
        void decreasePosAfterPos(pos_type pos);
 
        /// Returns the height of the highest font in range

-       Font_size highestInRange(
+       FontSize highestInRange(

                pos_type startpos,
                pos_type endpos,
                pos_type startpos,
                pos_type endpos,

-               Font_size def_size
-               ) const;
-
-       /// is there a font change in middle of the word?
-       bool hasChangeInRange(
-               pos_type pos, ///< position in the paragraph.
-               int len ///< length of the range to check.
+               FontSize def_size

                ) const;
 
        ///
                ) const;
 
        ///