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

fix merged build

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26152 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2008-08-13 21:39:59 +00:00
parent e8407f7078
commit 1da756723a
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/Previews.cpp
View File

@ -34,15 +34,15 @@ LyXRC_PreviewStatus Previews::status()
namespace { namespace {
typedef boost::shared_ptr<PreviewLoader> PreviewLoaderPtr; typedef boost::shared_ptr<PreviewLoader> PreviewLoaderPtr;
/// ///
typedef map<Buffer const *, PreviewLoaderPtr> CacheType; typedef map<Buffer const *, PreviewLoaderPtr> LyxCacheType;
/// ///
static CacheType preview_cache_; static LyxCacheType preview_cache_;
} }
PreviewLoader & Previews::loader(Buffer const & buffer) const PreviewLoader & Previews::loader(Buffer const & buffer) const
{ {
CacheType::iterator it = preview_cache_.find(&buffer); LyxCacheType::iterator it = preview_cache_.find(&buffer);
if (it == preview_cache_.end()) { if (it == preview_cache_.end()) {
PreviewLoaderPtr ptr(new PreviewLoader(buffer)); PreviewLoaderPtr ptr(new PreviewLoader(buffer));
@ -56,7 +56,7 @@ PreviewLoader & Previews::loader(Buffer const & buffer) const
void Previews::removeLoader(Buffer const & buffer) const void Previews::removeLoader(Buffer const & buffer) const
{ {
CacheType::iterator it = preview_cache_.find(&buffer); LyxCacheType::iterator it = preview_cache_.find(&buffer);
if (it != preview_cache_.end()) if (it != preview_cache_.end())
preview_cache_.erase(it); preview_cache_.erase(it);

20
src/insets/InsetVSpace.cpp
View File

@ -130,13 +130,13 @@ docstring const InsetVSpace::label() const
namespace { namespace {
int const arrow_size = 4; int const vspace_arrow_size = 4;
} }
void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
int height = 3 * arrow_size; int height = 3 * vspace_arrow_size;
if (space_.length().len().value() >= 0.0) if (space_.length().len().value() >= 0.0)
height = max(height, space_.inPixels(*mi.base.bv)); height = max(height, space_.inPixels(*mi.base.bv));
@ -153,7 +153,7 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
dim.asc = height / 2 + (a - d) / 2; // align cursor with the dim.asc = height / 2 + (a - d) / 2; // align cursor with the
dim.des = height - dim.asc; // label text dim.des = height - dim.asc; // label text
dim.wid = ADD_TO_VSPACE_WIDTH + 2 * arrow_size + 5 + w; dim.wid = ADD_TO_VSPACE_WIDTH + 2 * vspace_arrow_size + 5 + w;
// Cache the inset dimension. // Cache the inset dimension.
setDimCache(mi, dim); setDimCache(mi, dim);
} }
@ -178,14 +178,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
// adding or removing space // adding or removing space
bool const added = space_.kind() != VSpace::LENGTH || bool const added = space_.kind() != VSpace::LENGTH ||
space_.length().len().value() >= 0.0; space_.length().len().value() >= 0.0;
ty1 = added ? (start + arrow_size) : start; ty1 = added ? (start + vspace_arrow_size) : start;
ty2 = added ? start : (start + arrow_size); ty2 = added ? start : (start + vspace_arrow_size);
by1 = added ? (end - arrow_size) : end; by1 = added ? (end - vspace_arrow_size) : end;
by2 = added ? end : (end - arrow_size); by2 = added ? end : (end - vspace_arrow_size);
} }
int const midx = x + arrow_size; int const midx = x + vspace_arrow_size;
int const rightx = midx + arrow_size; int const rightx = midx + vspace_arrow_size;
// first the string // first the string
int w = 0; int w = 0;
@ -199,7 +199,7 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
docstring const lab = label(); docstring const lab = label();
theFontMetrics(font).rectText(lab, w, a, d); theFontMetrics(font).rectText(lab, w, a, d);
pi.pain.rectText(x + 2 * arrow_size + 5, pi.pain.rectText(x + 2 * vspace_arrow_size + 5,
start + (end - start) / 2 + (a - d) / 2, start + (end - start) / 2 + (a - d) / 2,
lab, font, Color_none, Color_none); lab, font, Color_none, Color_none);