From 29fbfe311067dbe6606afde7043b98a1234cef12 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Fri, 28 Jun 2013 00:26:08 -0400
Subject: [PATCH] DeskCalc: Style fixes

---
 src/apps/deskcalc/CalcView.cpp           | 43 ++++++++++++++----------
 src/apps/deskcalc/CalcWindow.cpp         |  2 +-
 src/apps/deskcalc/ExpressionTextView.cpp |  2 +-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp
index c597bcd72a..d2eecddfc9 100644
--- a/src/apps/deskcalc/CalcView.cpp
+++ b/src/apps/deskcalc/CalcView.cpp
@@ -45,9 +45,11 @@
 #include "CalcOptions.h"
 #include "ExpressionTextView.h"
 
+
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "CalcView"
 
+
 //const uint8 K_COLOR_OFFSET				= 32;
 const float kFontScaleY						= 0.4f;
 const float kFontScaleX						= 0.4f;
@@ -87,11 +89,13 @@ const char *kKeypadDescriptionScientific =
     "1     2     3     +     -    \n"
     "0     .     BS    =     C    \n";
 
+
 enum {
 	FLAGS_FLASH_KEY							= 1 << 0,
 	FLAGS_MOUSE_DOWN						= 1 << 1
 };
 
+
 struct CalcView::CalcKey {
 	char		label[8];
 	char		code[8];
@@ -684,27 +688,27 @@ CalcView::FrameResized(float width, float height)
 	fHeight = height;
 
 	// layout expression text view
-	BRect frame = _ExpressionRect();
+	BRect expressionRect = _ExpressionRect();
 	if (fOptions->keypad_mode == KEYPAD_MODE_COMPACT) {
-		frame.InsetBy(2, 2);
-		frame.right -= ceilf(fCalcIcon->Bounds().Width() * 1.5);
+		expressionRect.InsetBy(2, 2);
+		expressionRect.right -= ceilf(fCalcIcon->Bounds().Width() * 1.5);
 	} else
-		frame.InsetBy(4, 4);
+		expressionRect.InsetBy(4, 4);
 
-	fExpressionTextView->MoveTo(frame.LeftTop());
-	fExpressionTextView->ResizeTo(frame.Width(), frame.Height());
+	fExpressionTextView->MoveTo(expressionRect.LeftTop());
+	fExpressionTextView->ResizeTo(expressionRect.Width(), expressionRect.Height());
 
 	// configure expression text view font size and color
 	float sizeDisp = fOptions->keypad_mode == KEYPAD_MODE_COMPACT
-					 ? fHeight : fHeight * kDisplayScaleY;
+		? fHeight : fHeight * kDisplayScaleY;
 	BFont font(be_bold_font);
 	font.SetSize(sizeDisp * kExpressionFontScaleY);
 	fExpressionTextView->SetFontAndColor(&font, B_FONT_ALL);
 
-	frame.OffsetTo(B_ORIGIN);
-	float inset = (frame.Height() - fExpressionTextView->LineHeight(0)) / 2;
-	frame.InsetBy(0, inset);
-	fExpressionTextView->SetTextRect(frame);
+	expressionRect.OffsetTo(B_ORIGIN);
+	float inset = (expressionRect.Height() - fExpressionTextView->LineHeight(0)) / 2;
+	expressionRect.InsetBy(0, inset);
+	fExpressionTextView->SetTextRect(expressionRect);
 	Invalidate();
 }
 
@@ -929,12 +933,12 @@ CalcView::SetKeypadMode(uint8 mode)
 		{
 			if (window->Bounds() == Frame()) {
 				window->SetSizeLimits(kMinimumWidthCompact,
-									  kMaximumWidthCompact,
-									  kMinimumHeightCompact,
-									  kMaximumHeightCompact);
+					kMaximumWidthCompact, kMinimumHeightCompact,
+					kMaximumHeightCompact);
 				window->ResizeTo(width, height * kDisplayScaleY);
 			} else
 				ResizeTo(width, height * kDisplayScaleY);
+
 			break;
 		}
 
@@ -946,13 +950,14 @@ CalcView::SetKeypadMode(uint8 mode)
 			_ParseCalcDesc(fKeypadDescription);
 
 			window->SetSizeLimits(kMinimumWidthScientific,
-								  kMaximumWidthScientific,
-								  kMinimumHeightScientific,
-								  kMaximumHeightScientific);
+				kMaximumWidthScientific, kMinimumHeightScientific,
+				kMaximumHeightScientific);
+
 			if (width < kMinimumWidthScientific)
 				width = kMinimumWidthScientific;
 			if (width > kMaximumWidthScientific)
 				width = kMaximumWidthScientific;
+
 			if (height < kMinimumHeightScientific)
 				height = kMinimumHeightScientific;
 			if (height > kMaximumHeightScientific)
@@ -969,11 +974,13 @@ CalcView::SetKeypadMode(uint8 mode)
 			_ParseCalcDesc(fKeypadDescription);
 
 			window->SetSizeLimits(kMinimumWidthBasic, kMaximumWidthBasic,
-								  kMinimumHeightBasic, kMaximumHeightBasic);
+				kMinimumHeightBasic, kMaximumHeightBasic);
+
 			if (width < kMinimumWidthBasic)
 				width = kMinimumWidthBasic;
 			if (width > kMaximumWidthBasic)
 				width = kMaximumWidthBasic;
+
 			if (height < kMinimumHeightBasic)
 				height = kMinimumHeightBasic;
 			if (height > kMaximumHeightBasic)
diff --git a/src/apps/deskcalc/CalcWindow.cpp b/src/apps/deskcalc/CalcWindow.cpp
index 3f35c3599e..97212bfbdb 100644
--- a/src/apps/deskcalc/CalcWindow.cpp
+++ b/src/apps/deskcalc/CalcWindow.cpp
@@ -42,7 +42,7 @@ CalcWindow::CalcWindow(BRect frame, BMessage* settings)
 
 	// Size Limits are defined in CalcView.h
 	SetSizeLimits(kMinimumWidthBasic, kMaximumWidthBasic,
-				  kMinimumHeightBasic, kMaximumHeightBasic);
+		kMinimumHeightBasic, kMaximumHeightBasic);
 
 	frame.OffsetTo(B_ORIGIN);
 	fCalcView = new CalcView(frame, baseColor, settings);
diff --git a/src/apps/deskcalc/ExpressionTextView.cpp b/src/apps/deskcalc/ExpressionTextView.cpp
index f64b8c8356..5dcbc57b65 100644
--- a/src/apps/deskcalc/ExpressionTextView.cpp
+++ b/src/apps/deskcalc/ExpressionTextView.cpp
@@ -401,7 +401,7 @@ ExpressionTextView::PreviousExpression()
 	}
 
 	BString* item = (BString*)fPreviousExpressions.ItemAt(fHistoryPos);
-	if (item)
+	if (item != NULL)
 		SetExpression(item->String());
 }