From a4f0328efe7fe56e8e49575eb31a0ac18b676c0b Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Fri, 2 Nov 2012 18:52:36 -0400
Subject: [PATCH] Rename hextent and vextent to knobWidth and knobHeight

---
 src/kits/interface/ScrollBar.cpp             | 36 ++++++++++----------
 src/preferences/appearance/FakeScrollBar.cpp | 24 ++++++-------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp
index 75a6248737..48cd1da978 100644
--- a/src/kits/interface/ScrollBar.cpp
+++ b/src/kits/interface/ScrollBar.cpp
@@ -1159,15 +1159,15 @@ BScrollBar::Draw(BRect updateRect)
 
 	// draw the scrollbar thumb knobs
 	bool square = fPrivateData->fScrollBarInfo.knob == B_KNOB_STYLE_DOTS;
-	int32 hextent = 0;
-	int32 vextent = 0;
+	int32 knobWidth = 0;
+	int32 knobHeight = 0;
 
 	if (square) {
-		hextent = 2;
-		vextent = 2;
+		knobWidth = 2;
+		knobHeight = 2;
 	} else {
-		hextent = 1;
-		vextent = 3;
+		knobWidth = 1;
+		knobHeight = 3;
 	}
 
 	int32 flags = 0;
@@ -1179,35 +1179,35 @@ BScrollBar::Draw(BRect updateRect)
 
 	BRect middleKnob = BRect(
 		rect.left + hmiddle
-			- (fOrientation == B_HORIZONTAL ? hextent : vextent),
+			- (fOrientation == B_HORIZONTAL ? knobWidth : knobHeight),
 		rect.top + vmiddle
-			- (fOrientation == B_HORIZONTAL ? vextent : hextent),
+			- (fOrientation == B_HORIZONTAL ? knobHeight : knobWidth),
 		rect.left + hmiddle
-			+ (fOrientation == B_HORIZONTAL ? hextent : vextent),
+			+ (fOrientation == B_HORIZONTAL ? knobWidth : knobHeight),
 		rect.top + vmiddle
-			+ (fOrientation == B_HORIZONTAL ? vextent : hextent));
+			+ (fOrientation == B_HORIZONTAL ? knobHeight : knobWidth));
 
 	if (fOrientation == B_HORIZONTAL) {
-		BRect leftKnob = middleKnob.OffsetByCopy(hextent * -4, 0);
-		if (leftKnob.left > rect.left + hextent) {
+		BRect leftKnob = middleKnob.OffsetByCopy(knobWidth * -4, 0);
+		if (leftKnob.left > rect.left + knobWidth) {
 			be_control_look->DrawButtonBackground(this, leftKnob, updateRect,
 				normal, flags, BControlLook::B_ALL_BORDERS, fOrientation);
 		}
 
-		BRect rightKnob = middleKnob.OffsetByCopy(hextent * 4, 0);
-		if (rightKnob.right < rect.right - hextent) {
+		BRect rightKnob = middleKnob.OffsetByCopy(knobWidth * 4, 0);
+		if (rightKnob.right < rect.right - knobWidth) {
 			be_control_look->DrawButtonBackground(this, rightKnob, updateRect,
 				normal, flags, BControlLook::B_ALL_BORDERS, fOrientation);
 		}
 	} else {
-		BRect topKnob = middleKnob.OffsetByCopy(0, hextent * -4);
-		if (topKnob.top > rect.top + vextent) {
+		BRect topKnob = middleKnob.OffsetByCopy(0, knobWidth * -4);
+		if (topKnob.top > rect.top + knobHeight) {
 			be_control_look->DrawButtonBackground(this, topKnob, updateRect,
 				normal, flags, BControlLook::B_ALL_BORDERS, fOrientation);
 		}
 
-		BRect bottomKnob = middleKnob.OffsetByCopy(0, hextent * 4);
-		if (bottomKnob.bottom < rect.bottom - vextent) {
+		BRect bottomKnob = middleKnob.OffsetByCopy(0, knobWidth * 4);
+		if (bottomKnob.bottom < rect.bottom - knobHeight) {
 			be_control_look->DrawButtonBackground(this, bottomKnob, updateRect,
 				normal, flags, BControlLook::B_ALL_BORDERS, fOrientation);
 		}
diff --git a/src/preferences/appearance/FakeScrollBar.cpp b/src/preferences/appearance/FakeScrollBar.cpp
index 77c4ddf21f..8ca3de1737 100644
--- a/src/preferences/appearance/FakeScrollBar.cpp
+++ b/src/preferences/appearance/FakeScrollBar.cpp
@@ -148,30 +148,30 @@ FakeScrollBar::Draw(BRect updateRect)
 
 	// draw the scrollbar thumb knobs
 	bool square = fKnobStyle == B_KNOB_STYLE_DOTS;
-	int32 hextent = 0;
-	int32 vextent = 0;
+	int32 knobWidth = 0;
+	int32 knobHeight = 0;
 
 	if (square) {
-		hextent = 2;
-		vextent = 2;
+		knobWidth = 2;
+		knobHeight = 2;
 	} else {
-		hextent = 1;
-		vextent = 3;
+		knobWidth = 1;
+		knobHeight = 3;
 	}
 
 	float hmiddle = bgRect.Width() / 2;
 	float vmiddle = bgRect.Height() / 2;
 
-	BRect middleKnob = BRect(bgRect.left + hmiddle - hextent,
-		bgRect.top + vmiddle - vextent,
-		bgRect.left + hmiddle + hextent,
-		bgRect.top + vmiddle + vextent);
+	BRect middleKnob = BRect(bgRect.left + hmiddle - knobWidth,
+		bgRect.top + vmiddle - knobHeight,
+		bgRect.left + hmiddle + knobWidth,
+		bgRect.top + vmiddle + knobHeight);
 
-	BRect leftKnob = middleKnob.OffsetByCopy(hextent * -4, 0);
+	BRect leftKnob = middleKnob.OffsetByCopy(knobWidth * -4, 0);
 	be_control_look->DrawButtonBackground(this, leftKnob, updateRect,
 		normal, 0, BControlLook::B_ALL_BORDERS, B_HORIZONTAL);
 
-	BRect rightKnob = middleKnob.OffsetByCopy(hextent * 4, 0);
+	BRect rightKnob = middleKnob.OffsetByCopy(knobWidth * 4, 0);
 	be_control_look->DrawButtonBackground(this, rightKnob, updateRect,
 		normal, 0, BControlLook::B_ALL_BORDERS, B_HORIZONTAL);