i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BBox: Correct low color for drawing label.

Browse Source 
Includes some simplification for existing code.

Fixes #12628, which was mostly exhibited in FilWip and a few other legacy
applications which used the default low color and a custom background color.

Signed-off-by: Augustin Cavalier <[email protected]>
This commit is contained in:
looncraz
2016-07-16 12:50:51 -04:00
committed by Augustin Cavalier
parent 2e95f9e6df
commit 7cdea13cf9
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Box.cpp
+12 -6
View File
@@ -273,11 +273,17 @@ BBox::AttachedToWindow()
{ {
AdoptParentColors(); AdoptParentColors();
if (ViewColor() == B_TRANSPARENT_COLOR) { // Force low color to match view color for proper label drawing.
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); float viewTint = B_NO_TINT;
SetLowUIColor(B_PANEL_BACKGROUND_COLOR); float lowTint = B_NO_TINT;
SetHighUIColor(B_PANEL_TEXT_COLOR);
} if (LowUIColor(&lowTint) != ViewUIColor(&viewTint) || viewTint != lowTint)
SetLowUIColor(ViewUIColor(), viewTint);
else if (LowColor() != ViewColor())
SetLowColor(ViewColor());
if (ViewColor() == B_TRANSPARENT_COLOR)
AdoptSystemColors();
// The box could have been resized in the mean time // The box could have been resized in the mean time
fBounds = Bounds(); fBounds = Bounds();
@@ -659,7 +665,7 @@ BBox::_InitObject(BMessage* archive)
fLabelView = ChildAt(0); fLabelView = ChildAt(0);
} }
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); AdoptSystemColors();
} }