Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DeskCalc: Remove __HAIKU__ ifdef

Browse Source 
No functional change intended

Change-Id: I934bef5c8b09a267c423edf7698bb57170e43945
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3559
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
Reviewed-by: Stephan Aßmus <superstippi@gmx.de>
This commit is contained in:
Pascal Abresch 2020-12-29 15:38:27 +01:00 committed by Stephan Aßmus
parent 013554844f
commit 0d6b19e963
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/apps/deskcalc/CalcView.cpp
View File

@ -205,11 +205,7 @@ CalcView::CalcView(BRect frame, rgb_color rgbBaseColor, BMessage* settings)
fKeypadDescription(kKeypadDescriptionBasic),
fKeypad(NULL),
#ifdef __HAIKU__
fCalcIcon(new BBitmap(BRect(0, 0, 15, 15), 0, B_RGBA32)),
#else
fCalcIcon(new BBitmap(BRect(0, 0, 15, 15), 0, B_CMAP8)),
#endif
fPopUpMenu(NULL),
fAutoNumlockItem(NULL),
@ -243,11 +239,7 @@ CalcView::CalcView(BMessage* archive)
fKeypadDescription(kKeypadDescriptionBasic),
fKeypad(NULL),
#ifdef __HAIKU__
fCalcIcon(new BBitmap(BRect(0, 0, 15, 15), 0, B_RGBA32)),
#else
fCalcIcon(new BBitmap(BRect(0, 0, 15, 15), 0, B_CMAP8)),
#endif
fPopUpMenu(NULL),
fAutoNumlockItem(NULL),
@ -496,12 +488,8 @@ CalcView::Draw(BRect updateRect)
FillRect(updateRect & expressionRect);
}
if (fCalcIcon->ColorSpace() == B_RGBA32) {
SetDrawingMode(B_OP_ALPHA);
SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
} else {
SetDrawingMode(B_OP_OVER);
}
SetDrawingMode(B_OP_ALPHA);
SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
BPoint iconPos;
iconPos.x = expressionRect.right - (expressionRect.Width()