From d90a465e0831547f5378748680b1f68b877dc6f1 Mon Sep 17 00:00:00 2001
From: Alex Wilson <yourpalal2@gmail.com>
Date: Sat, 18 Jun 2011 00:37:39 +0000
Subject: [PATCH] Change the value of other spacing/inset constants so that
 B_USE_DEFAULT_SPACING has its own unique value. Also adjust
 BControlLook::ComposeSpacing() to reflect this. closes #7447

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42222 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/interface/InterfaceDefs.h | 20 ++++++++++----------
 src/kits/interface/ControlLook.cpp   |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/headers/os/interface/InterfaceDefs.h b/headers/os/interface/InterfaceDefs.h
index e33e5f7621..40f2d89365 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -229,16 +229,16 @@ enum vertical_alignment {
 
 enum {
 	B_USE_DEFAULT_SPACING = -2,
-	B_USE_ITEM_SPACING = -2,
-	B_USE_ITEM_INSETS = -2,
-	B_USE_HALF_ITEM_SPACING = -3,
-	B_USE_HALF_ITEM_INSETS = -3,
-	B_USE_WINDOW_INSETS = -4,
-	B_USE_WINDOW_SPACING = -4,
-	B_USE_SMALL_INSETS = -5,
-	B_USE_SMALL_SPACING = -5,
-	B_USE_BIG_INSETS = -6,
-	B_USE_BIG_SPACING = -6
+	B_USE_ITEM_SPACING = -3,
+	B_USE_ITEM_INSETS = -3,
+	B_USE_HALF_ITEM_SPACING = -4,
+	B_USE_HALF_ITEM_INSETS = -4,
+	B_USE_WINDOW_INSETS = -5,
+	B_USE_WINDOW_SPACING = -5,
+	B_USE_SMALL_INSETS = -6,
+	B_USE_SMALL_SPACING = -6,
+	B_USE_BIG_INSETS = -7,
+	B_USE_BIG_SPACING = -7
 };
 
 
diff --git a/src/kits/interface/ControlLook.cpp b/src/kits/interface/ControlLook.cpp
index 9ab89514f4..3f01f5cc2e 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -53,8 +53,7 @@ BControlLook::DefaultItemSpacing() const
 float
 BControlLook::ComposeSpacing(float spacing)
 {
-	// We only need to check one of each synonym (B_*_SPACING | B_*_INSETS)
-	if (spacing == B_USE_ITEM_SPACING) {
+	if (spacing == B_USE_DEFAULT_SPACING || spacing == B_USE_ITEM_SPACING) {
 		return be_control_look->DefaultItemSpacing();
 	} else if (spacing == B_USE_HALF_ITEM_SPACING) {
 		return be_control_look->DefaultItemSpacing() * 0.5f;