simplify rectText and buttonText add separate metric methods for these

[features.git] / src / text.C

diff --git a/src/text.C b/src/text.C
index 01349da75ca65ec2f6c54a2c97f44d8db960c684..8d499450130ce4290454865a3885718f0a4855a1 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -37,6 +37,7 @@
 #include "language.h"
 #include "ParagraphParameters.h"
 #include "undo_funcs.h"
+#include "font.h"
 
 using std::max;
 using std::min;
@@ -3152,12 +3153,18 @@ void LyXText::getVisibleRow(BufferView * bview, int y_offset, int x_offset,
                                  y_offset + y_top + 2 * defaultHeight(),
                                  LColor::pagebreak, 
                                  Painter::line_onoffdash)
+#if 0
                                .rectText(0,
                                          0,
                                          _("Page Break (top)"),
                                          pb_font,
                                          LColor::background,
                                          LColor::background, false, w, a, d);
+#else
+                       ;
+                       lyxfont::rectText(_("Page Break (top)"), pb_font,
+                                         w, a, d);
+#endif
                        pain.rectText((ww - w)/2,
                                      y_offset + y_top + 2 * defaultHeight() + d,
                                      _("Page Break (top)"),
@@ -3343,11 +3350,17 @@ void LyXText::getVisibleRow(BufferView * bview, int y_offset, int x_offset,
                                .line(0, y_place, ww, y_place,
                                      LColor::pagebreak,
                                      Painter::line_onoffdash)
+#if 0
                                .rectText(0, 0,
                                          _("Page Break (bottom)"),
                                          pb_font,
                                          LColor::background,
                                          LColor::background, false, w, a, d);
+#else
+                       ;
+                       lyxfont::rectText(_("Page Break (bottom)"), pb_font,
+                                         w, a, d);
+#endif
                        pain.rectText((ww - w) / 2, y_place + d,
                                      _("Page Break (bottom)"),
                                      pb_font,