anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the painting of the labels of InsetCaption insets.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36639 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-12-01 00:32:30 +00:00
parent ec599dc680
commit e7ef325db5
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insets/InsetCaption.cpp
View File

@ -32,6 +32,7 @@
#include "OutputParams.h" #include "OutputParams.h"
#include "Paragraph.h" #include "Paragraph.h"
#include "TextClass.h" #include "TextClass.h"
#include "TextMetrics.h"
#include "TocBackend.h" #include "TocBackend.h"
#include "frontends/FontMetrics.h" #include "frontends/FontMetrics.h"
@ -140,6 +141,15 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
} }
void InsetCaption::drawBackground(PainterInfo & pi, int x, int y) const
{
TextMetrics & tm = pi.base.bv->textMetrics(&text());
int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
int const yy = y - TEXT_TO_INSET_OFFSET - tm.ascent();
pi.pain.fillRectangle(x, yy, labelwidth_, h, Color_red);
}
void InsetCaption::draw(PainterInfo & pi, int x, int y) const void InsetCaption::draw(PainterInfo & pi, int x, int y) const
{ {
// We must draw the label, we should get the label string // We must draw the label, we should get the label string
@ -153,7 +163,8 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
FontInfo tmpfont = pi.base.font; FontInfo tmpfont = pi.base.font;
pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo(); pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor); pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
pi.pain.text(x, y, full_label_, pi.base.font); int const xx = x + TEXT_TO_INSET_OFFSET;
pi.pain.text(xx, y, full_label_, pi.base.font);
InsetText::draw(pi, x + labelwidth_, y); InsetText::draw(pi, x + labelwidth_, y);
pi.base.font = tmpfont; pi.base.font = tmpfont;
} }

2
src/insets/InsetCaption.h
View File

@ -52,6 +52,8 @@ private:
bool descendable(BufferView const &) const { return true; } bool descendable(BufferView const &) const { return true; }
/// ///
void metrics(MetricsInfo & mi, Dimension & dim) const; void metrics(MetricsInfo & mi, Dimension & dim) const;
///
void drawBackground(PainterInfo & pi, int x, int y) const;
/// ///
void draw(PainterInfo & pi, int x, int y) const; void draw(PainterInfo & pi, int x, int y) const;
/// ///