* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#endif
#include "insetcommand.h"
-#include "lyxdraw.h"
#include "debug.h"
#include "Painter.h"
+using std::ostream;
+using std::endl;
+
+
InsetCommand::InsetCommand()
{
}
}
-#ifdef USE_PAINTER
-int InsetCommand::ascent(Painter &, LyXFont const & font) const
-{
- LyXFont f = font;
- f.decSize();
- return f.maxAscent() + 3;
-}
-#else
-int InsetCommand::Ascent(LyXFont const & font) const
-{
- LyXFont f = font;
- f.decSize();
- return f.maxAscent() + 3;
-}
-#endif
-
-
-#ifdef USE_PAINTER
-int InsetCommand::descent(Painter &, LyXFont const & font) const
+int InsetCommand::ascent(Painter & pain, LyXFont const &) const
{
- LyXFont f = font;
- f.decSize();
- return f.maxDescent() + 3;
-}
-#else
-int InsetCommand::Descent(LyXFont const & font) const
-{
- LyXFont f = font;
- f.decSize();
- return f.maxDescent() + 3;
+ LyXFont font(LyXFont::ALL_SANE);
+ font.decSize();
+
+ int width, ascent, descent;
+ string s = getScreenLabel();
+
+ if (Editable()) {
+ pain.buttonText(0, 0, s, font,
+ false, width, ascent, descent);
+ } else {
+ pain.rectText(0, 0, s, font,
+ LColor::commandbg, LColor::commandframe,
+ false, width, ascent, descent);
+ }
+ return ascent;
}
-#endif
-#ifdef USE_PAINTER
-int InsetCommand::width(Painter &, LyXFont const & font) const
+int InsetCommand::descent(Painter & pain, LyXFont const &) const
{
- LyXFont f = font;
- f.decSize();
- string s = getScreenLabel();
- return 10 + f.stringWidth(s);
-}
-#else
-int InsetCommand::Width(LyXFont const & font) const
-{
- LyXFont f = font;
- f.decSize();
- string s = getScreenLabel();
- return 10 + f.stringWidth(s);
+ LyXFont font(LyXFont::ALL_SANE);
+ font.decSize();
+
+ int width, ascent, descent;
+ string s = getScreenLabel();
+
+ if (Editable()) {
+ pain.buttonText(0, 0, s, font,
+ false, width, ascent, descent);
+ } else {
+ pain.rectText(0, 0, s, font,
+ LColor::commandbg, LColor::commandframe,
+ false, width, ascent, descent);
+ }
+ return descent;
}
-#endif
-#ifdef USE_PAINTER
-void InsetCommand::draw(Painter & pain, LyXFont const & font,
- int baseline, float & x) const
+int InsetCommand::width(Painter & pain, LyXFont const &) const
{
- // Draw it as a box with the LaTeX text
- x += 3;
-
- pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
- width(pain, font) - 6,
- ascent(pain, font) + descent(pain, font) - 2,
- LColor::insetbg);
- // Tell whether this slows down the drawing (ale)
- // lets draw editable and non-editable insets differently
+ LyXFont font(LyXFont::ALL_SANE);
+ font.decSize();
+
+ int width, ascent, descent;
+ string s = getScreenLabel();
+
if (Editable()) {
- int y = baseline - ascent(pain, font) + 1;
- int w = width(pain, font) - 6;
- int h = ascent(pain, font) + descent(pain, font) - 2;
- pain.rectangle(int(x), y, w, h, LColor::insetframe);
+ pain.buttonText(0, 0, s, font,
+ false, width, ascent, descent);
} else {
-
- pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
- width(pain, font) - 6,
- ascent(pain, font) + descent(pain, font) - 2,
- LColor::insetframe);
+ pain.rectText(0, 0, s, font,
+ LColor::commandbg, LColor::commandframe,
+ false, width, ascent, descent);
}
- string s = getScreenLabel();
- LyXFont f(font);
- f.decSize();
- f.setColor(LColor::none);
- f.setLatex(LyXFont::OFF);
- pain.text(int(x + 2), baseline, s, f);
-
- x += width(pain, font) - 3;
+ return width + 4;
}
-#else
-void InsetCommand::Draw(LyXFont font, LyXScreen & scr,
- int baseline, float & x)
+
+
+void InsetCommand::draw(Painter & pain, LyXFont const &,
+ int baseline, float & x) const
{
// Draw it as a box with the LaTeX text
- x += 3;
-
- scr.fillRectangle(gc_lighted,
- int(x), baseline - Ascent(font) + 1,
- Width(font) - 6,
- Ascent(font) + Descent(font)-2);
- // Tell whether this slows down the drawing (ale)
- // lets draw editable and non-editable insets differently
- if (Editable()) {
- int y = baseline - Ascent(font)+1, w = Width(font)-6,
- h = (Ascent(font)+Descent(font)-2);
- scr.drawFrame(FL_UP_FRAME, int(x), y, w, h, FL_BLACK, -1);
+ LyXFont font(LyXFont::ALL_SANE);
+ font.setColor(LColor::command).decSize();
+
+ int width;
+ string s = getScreenLabel();
+
+ if (Editable()) {
+ pain.buttonText(int(x)+2, baseline, s, font, true, width);
} else {
- scr.drawRectangle(gc_note_frame,
- int(x), baseline - Ascent(font)+1,
- Width(font)-6,
- Ascent(font)+Descent(font)-2);
+ pain.rectText(int(x)+2, baseline, s, font,
+ LColor::commandbg, LColor::commandframe,
+ true, width);
}
- string s = getScreenLabel();
- LyXFont f = font;
- f.decSize();
- f.setColor(LyXFont::NONE);
- f.setLatex(LyXFont::OFF);
- scr.drawString(f, s, baseline, int(x+2));
- x += Width(font) - 3;
+ x += width + 4;
}
-#endif
// In lyxf3 this will be just LaTeX
-void InsetCommand::Write(ostream & os)
+void InsetCommand::Write(ostream & os) const
{
os << "LatexCommand " << getCommand() << "\n";
}
}
-int InsetCommand::Latex(ostream & os, signed char /*fragile*/)
+int InsetCommand::Latex(ostream & os, bool /*fragile*/, bool/*fs*/) const
{
os << getCommand();
return 0;
}
-int InsetCommand::Latex(string & file, signed char /*fragile*/)
+int InsetCommand::Ascii(ostream &) const
{
- file += getCommand();
return 0;
}
-int InsetCommand::Linuxdoc(string &/*file*/)
+int InsetCommand::Linuxdoc(ostream &) const
{
return 0;
}
-int InsetCommand::DocBook(string &/*file*/)
+int InsetCommand::DocBook(ostream &) const
{
return 0;
}
projects / lyx.git / blobdiff