anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adjust caption metrics to fix bug 3217

Browse Source 
http://bugzilla.lyx.org/show_bug.cgi?id=3217

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17143 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2007-02-11 23:35:12 +00:00
parent e9d9f2e27b
commit c9008ed3d8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/insetcaption.C
View File

@ -132,6 +132,8 @@ bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
full_label_ = bformat(from_ascii("%1$s %2$s:"), label, number); full_label_ = bformat(from_ascii("%1$s %2$s:"), label, number);
} }
labelwidth_ = theFontMetrics(mi.base.font).width(full_label_); labelwidth_ = theFontMetrics(mi.base.font).width(full_label_);
// add some space to separate the label from the inset text
labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
dim.wid = labelwidth_; dim.wid = labelwidth_;
Dimension textdim; Dimension textdim;
InsetText::metrics(mi, textdim); InsetText::metrics(mi, textdim);
@ -143,7 +145,7 @@ bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
dim.wid += textdim.wid; dim.wid += textdim.wid;
dim.asc += TEXT_TO_INSET_OFFSET; dim.asc += TEXT_TO_INSET_OFFSET;
dim.des += TEXT_TO_INSET_OFFSET; dim.des += TEXT_TO_INSET_OFFSET;
dim.wid += 2 * TEXT_TO_INSET_OFFSET; dim.wid += 0.5 * TEXT_TO_INSET_OFFSET;
mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET; mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
bool const changed = dim_ != dim; bool const changed = dim_ != dim;
dim_ = dim; dim_ = dim;
@ -162,6 +164,8 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
// Answer: the text inset (in buffer_funcs.C: setCaption). // Answer: the text inset (in buffer_funcs.C: setCaption).
labelwidth_ = pi.pain.text(x, y, full_label_, pi.base.font); labelwidth_ = pi.pain.text(x, y, full_label_, pi.base.font);
// add some space to separate the label from the inset text
labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
InsetText::draw(pi, x + labelwidth_, y); InsetText::draw(pi, x + labelwidth_, y);
setPosCache(pi, x, y); setPosCache(pi, x, y);
} }
@ -169,7 +173,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
void InsetCaption::drawSelection(PainterInfo & pi, int x, int y) const void InsetCaption::drawSelection(PainterInfo & pi, int x, int y) const
{ {
InsetText::drawSelection(pi, x + labelwidth_ , y); InsetText::drawSelection(pi, x + labelwidth_, y);
} }