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 my color cache "improvements"

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25029 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2008-05-31 22:39:52 +00:00
parent a694de895e
commit 7f678a39cd
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt4/ColorCache.cpp
View File

@ -16,6 +16,7 @@
#include <string>
namespace lyx {
void ColorCache::init()
@ -27,11 +28,14 @@ void ColorCache::init()
/// get the given color
QColor const & ColorCache::get(ColorCode color) const
QColor ColorCache::get(ColorCode color) const
{
if (!initialized_)
const_cast<ColorCache *>(this)->init();
return lcolors_[color];
if (color <= Color_ignore)
return lcolors_[color];
// used by branches
return QColor(lcolor.getX11Name(color).c_str());
}

2
src/frontends/qt4/ColorCache.h
View File

@ -29,7 +29,7 @@ public:
ColorCache() : initialized_(false) {}
/// get the given color
QColor const & get(ColorCode color) const;
QColor get(ColorCode color) const;
/// clear all colors
void clear() { initialized_ = false; }

17
src/insets/InsetBranch.cpp
View File

@ -82,9 +82,8 @@ void InsetBranch::setButtonLabel()
if (!params_.branch.empty()) {
// FIXME UNICODE
ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
if (c == Color_none) {
if (c == Color_none)
s = _("Undef: ") + s;
}
}
if (decoration() == InsetLayout::Classic)
setLabel(isOpen() ? s : getNewLabel(s) );
@ -95,15 +94,13 @@ void InsetBranch::setButtonLabel()
ColorCode InsetBranch::backgroundColor() const
{
if (!params_.branch.empty()) {
// FIXME UNICODE
ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
if (c == Color_none) {
c = Color_error;
}
return c;
} else
if (params_.branch.empty())
return Inset::backgroundColor();
// FIXME UNICODE
ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
if (c == Color_none)
c = Color_error;
return c;
}