John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index fdc849bfa78f563da504cacc950568111af27076..8c6114ea6241f02b5b2536f47f266d30b3df5723 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -560,9 +560,9 @@ private:
                Painter * pain; 
                // has the background been cleared
                bool cleared;
-               /// x offset
+               /// x offset (e.g. for insets)
                int xo;
-               /// y offset 
+               /// y offset (e.g. for insets)
                int yo;
                /// FIXME
                float x;
@@ -590,6 +590,13 @@ private:
        /// paint env depth bar 
        void paintRowDepthBar(DrawRowParams & p);
  
+       /// get the on-screen size of the length marker
+       int getLengthMarkerHeight(BufferView * bv, VSpace const & vsp) const;
+ 
+       /// paint an added space marker
+       int drawLengthMarker(DrawRowParams & p, string const & str,
+               VSpace const & vsp, int start); 
+ 
        /// paint a first row in a paragraph
        void paintFirstRow(DrawRowParams & p);
  
@@ -605,7 +612,7 @@ private:
                                  LyXCursor & cur,
                                  LyXCursor const & where) const;
        
-       ///
+       /// delete double space or empty paragraphs around old_cursor 
        void deleteEmptyParagraphMechanism(BufferView *,
                                           LyXCursor const & old_cursor) const;
 
@@ -627,9 +634,23 @@ private:
        ///
        int singleWidth(BufferView *, Paragraph * par,
                lyx::pos_type pos, char c) const;
-       ///
-       void draw(BufferView *, Row const * row,
-                 lyx::pos_type & pos, int offset, float & x, bool cleared);
+
+ 
+       /// draw normal chars
+       void drawChars(DrawRowParams & p, lyx::pos_type & vpos,
+               bool hebrew, bool arabic);
+       /// draw from arabic composed char
+       void drawArabicComposeChar(DrawRowParams & p, lyx::pos_type & vpos);
+       /// draw from hebrew composed char
+       void drawHebrewComposeChar(DrawRowParams & p, lyx::pos_type & vpos);
+       /// draw a mark for foreign language, starting from orig_x
+       void drawForeignMark(DrawRowParams & p, float const orig_x, LyXFont const & orig_font);
+       /// draw an inset 
+       void drawInset(DrawRowParams & p, lyx::pos_type const pos);
+       /// draw new line marker
+       void drawNewline(DrawRowParams & p, lyx::pos_type const pos);
+       /// draw text
+       void draw(DrawRowParams & p, lyx::pos_type & vpos);
 
        /// get the next breakpoint in a given paragraph
        lyx::pos_type nextBreakPoint(BufferView *, Row const * row, int width) const;