i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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 <[email protected]>
Reviewed-by: Stephan Aßmus <[email protected]>
This commit is contained in:
Pascal Abresch
2020-12-30 14:47:39 +00:00
committed by Stephan Aßmus
parent 013554844f
commit 0d6b19e963
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskcalc/CalcView.cpp
+2 -14
View File
@@ -205,11 +205,7 @@ CalcView::CalcView(BRect frame, rgb_color rgbBaseColor, BMessage* settings)
fKeypadDescription(kKeypadDescriptionBasic), fKeypadDescription(kKeypadDescriptionBasic),
fKeypad(NULL), fKeypad(NULL),
#ifdef __HAIKU__
fCalcIcon(new BBitmap(BRect(0, 0, 15, 15), 0, B_RGBA32)), 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), fPopUpMenu(NULL),
fAutoNumlockItem(NULL), fAutoNumlockItem(NULL),
@@ -243,11 +239,7 @@ CalcView::CalcView(BMessage* archive)
fKeypadDescription(kKeypadDescriptionBasic), fKeypadDescription(kKeypadDescriptionBasic),
fKeypad(NULL), fKeypad(NULL),
#ifdef __HAIKU__
fCalcIcon(new BBitmap(BRect(0, 0, 15, 15), 0, B_RGBA32)), 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), fPopUpMenu(NULL),
fAutoNumlockItem(NULL), fAutoNumlockItem(NULL),
@@ -496,12 +488,8 @@ CalcView::Draw(BRect updateRect)
FillRect(updateRect & expressionRect); FillRect(updateRect & expressionRect);
} }
if (fCalcIcon->ColorSpace() == B_RGBA32) { SetDrawingMode(B_OP_ALPHA);
SetDrawingMode(B_OP_ALPHA); SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
} else {
SetDrawingMode(B_OP_OVER);
}
BPoint iconPos; BPoint iconPos;
iconPos.x = expressionRect.right - (expressionRect.Width() iconPos.x = expressionRect.right - (expressionRect.Width()