Added new FINISED states FINISHED_RIGHT, FINISHED_UP, FINISHED_DOWN.

[lyx.git] / src / font.C

diff --git a/src/font.C b/src/font.C
index f022b22c41eedb25c4ab4e8848368759466b7b51..ef93daa5f91e623baba57cf6d243ff588e5ba143 100644 (file)
--- a/src/font.C
+++ b/src/font.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -177,7 +177,7 @@ int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
        } else {
                // emulate smallcaps since X doesn't support this
                unsigned int result = 0;
-               static XChar2b c = {0, 0};
+               static XChar2b c;
                LyXFont smallfont(f);
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
                for (int i = 0; i < n; ++i) {
@@ -186,7 +186,7 @@ int lyxfont::width(XChar2b const * s, int n, LyXFont const & f)
                                result += ::XTextWidth16(getXFontstruct(smallfont), &c, 1);
                        } else {
                                result += ::XTextWidth16(getXFontstruct(f), &s[i], 1);
-                       }
+               }
                }
                return result;
        }
@@ -209,5 +209,28 @@ void lyxfont::XSetFont(Display * display, GC gc, LyXFont const & f)
        ::XSetFont(display, gc, getFontID(f));
 }
 
+
+void lyxfont::rectText(string const & str, LyXFont const & font,
+             int & width, int & ascent, int & descent)
+{
+       static int const d = 2;
+       width = lyxfont::width(str, font) + d * 2 + 2;
+       ascent = lyxfont::maxAscent(font) + d;
+       descent = lyxfont::maxDescent(font) + d;
+}
+
+
+
+void lyxfont::buttonText(string const & str, LyXFont const & font,
+               int & width, int & ascent, int & descent)
+{
+       static int const d = 3;
+       
+       width = lyxfont::width(str, font) + d * 2 + 2;
+       ascent = lyxfont::maxAscent(font) + d;
+       descent = lyxfont::maxDescent(font) + d;
+}
+
+
 //} // end of namespace font
 //} // end of namespace lyx