github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-10 03:54:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

LabelBox default color now same as textcolor

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11716 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-01-22 11:42:15 +00:00
parent 2e1f946a6e
commit db70fe53ad
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CtrlLib/Static.cpp
View file

@ -79,14 +79,16 @@ Label::Label() {
Label::~Label() {}
CH_COLOR(LabelBoxTextColor, IsDark(SColorFace()) ? Blend(LtBlue(), White) : LtBlue());
CH_COLOR(LabelBoxDisabledTextColor, SColorDisabled());
CH_COLOR(LabelBoxColor, SColorShadow());
// these are not used now
CH_COLOR(LabelBoxTextColor, IsDark(SColorFace()) ? White() : Black());
CH_COLOR(LabelBoxDisabledTextColor, SColorDisabled());
LabelBox::LabelBox()
{
color = Null;
LabelBase::SetInk(LabelBoxTextColor, LabelBoxDisabledTextColor);
LabelBase::SetInk(SColorText(), SColorDisabled());
SetVAlign(ALIGN_TOP);
#if defined(flagWINGL) || defined(flagLINUXGL)
ClipToBounds(false);