ProcessController: style fixes to TeamBarMenuItem

src/apps/processcontroller/TeamBarMenuItem.cpp

@@ -33,7 +33,8 @@
 
 TeamBarMenuItem::TeamBarMenuItem(BMenu* menu, BMessage* kill_team, team_id team,
 	BBitmap* icon, bool deleteIcon)
-	: BMenuItem(menu, kill_team),
+	:
+	BMenuItem(menu, kill_team),
 	fTeamID(team),
 	fIcon(icon),
 	fDeleteIcon(deleteIcon)
@@ -51,9 +52,10 @@ TeamBarMenuItem::Init()
 	if (fTeamID == B_SYSTEM_TEAM) {
 		thread_info thinfos;
 		bigtime_t idle = 0;
-		for (unsigned int t = 1; t <= gCPUcount; t++)
+		for (unsigned int t = 1; t <= gCPUcount; t++) {
 			if (get_thread_info(t, &thinfos) == B_OK)
 				idle += thinfos.kernel_time + thinfos.user_time;
+		}
 		fTeamUsageInfo.kernel_time += fTeamUsageInfo.user_time;
 		fTeamUsageInfo.user_time = idle;
 	}
@@ -82,6 +84,7 @@ TeamBarMenuItem::DrawContent()
 		BarUpdate();
 	else
 		DrawBar(true);
+
 	loc = ContentLocation();
 	loc.x += 20;
 	Menu()->MovePenTo(loc);
@@ -92,7 +95,7 @@ TeamBarMenuItem::DrawContent()
 void
 TeamBarMenuItem::DrawIcon()
 {
-	if (!fIcon)
+	if (fIcon == NULL)
 		return;
 
 	BPoint loc = ContentLocation();
@@ -130,30 +133,39 @@ TeamBarMenuItem::DrawBar(bool force)
 
 	if (fGrenze1 < 0)
 		force = true;
+
 	if (force) {
 		if (selected)
 			menu->SetHighColor(gFrameColorSelected);
 		else
 			menu->SetHighColor(gFrameColor);
+
 		menu->StrokeRect(frame);
 	}
 
 	frame.InsetBy(1, 1);
 	BRect r = frame;
-	float grenze1 = frame.left + (frame.right - frame.left) * fKernel / gCPUcount;
+	float grenze1 = frame.left + (frame.right - frame.left)
-	float grenze2 = frame.left + (frame.right - frame.left) * (fKernel + fUser) / gCPUcount;
+		* fKernel / gCPUcount;
+	float grenze2 = frame.left + (frame.right - frame.left)
+		* (fKernel + fUser) / gCPUcount;
+
 	if (grenze1 > frame.right)
 		grenze1 = frame.right;
+
 	if (grenze2 > frame.right)
 		grenze2 = frame.right;
+
 	r.right = grenze1;
 	if (!force)
 		r.left = fGrenze1;
+
 	if (r.left < r.right) {
 		if (selected)
 			menu->SetHighColor(gKernelColorSelected);
 		else
 			menu->SetHighColor(gKernelColor);
+
 		menu->FillRect(r);
 	}
 
@@ -163,15 +175,22 @@ TeamBarMenuItem::DrawBar(bool force)
 	if (!force) {
 		if (fGrenze2 > r.left && r.left >= fGrenze1)
 			r.left = fGrenze2;
+
 		if (fGrenze1 < r.right && r.right <= fGrenze2)
 			r.right = fGrenze1;
 	}
 
 	if (r.left < r.right) {
-		if (selected)
+		if (selected) {
-			menu->SetHighColor(fTeamID == B_SYSTEM_TEAM ? gIdleColorSelected : gUserColorSelected);
+			menu->SetHighColor(fTeamID == B_SYSTEM_TEAM
-		else
+				? gIdleColorSelected
-			menu->SetHighColor(fTeamID == B_SYSTEM_TEAM ? gIdleColor : gUserColor);
+				: gUserColorSelected);
+		} else {
+			menu->SetHighColor(fTeamID == B_SYSTEM_TEAM
+				? gIdleColor
+				: gUserColor);
+		}
+
 		menu->FillRect(r);
 	}
 
@@ -180,11 +199,13 @@ TeamBarMenuItem::DrawBar(bool force)
 
 	if (!force)
 		r.right = fGrenze2;
+
 	if (r.left < r.right) {
 		if (selected)
 			menu->SetHighColor(gWhiteSelected);
 		else
 			menu->SetHighColor(kWhite);
+
 		menu->FillRect(r);
 	}
 
@@ -225,10 +246,12 @@ TeamBarMenuItem::BarUpdate()
 		fKernel = double(usage.kernel_time - fTeamUsageInfo.kernel_time - idle)
 			/ double(now - fLastTime);
 
-		fUser = double(usage.user_time - fTeamUsageInfo.user_time) / double(now - fLastTime);
+		fUser = double(usage.user_time - fTeamUsageInfo.user_time)
+			/ double(now - fLastTime);
 
 		if (fKernel < 0)
 			fKernel = 0;
+
 		fLastTime = now;
 		fTeamUsageInfo = usage;
 		DrawBar(false);

src/apps/processcontroller/TeamBarMenuItem.h

@@ -53,4 +53,5 @@ class TeamBarMenuItem : public BMenuItem {
 	bool			fDeleteIcon;
 };
 
+
 #endif // _TEAM_BAR_MENU_ITEM_H_