i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
closes #7447


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42222 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson
2011-06-18 00:37:39 +00:00
parent 5e90adf5d7
commit d90a465e08
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/InterfaceDefs.h
+10 -10
View File
@@ -229,16 +229,16 @@ enum vertical_alignment {
enum { enum {
B_USE_DEFAULT_SPACING = -2, B_USE_DEFAULT_SPACING = -2,
B_USE_ITEM_SPACING = -2, B_USE_ITEM_SPACING = -3,
B_USE_ITEM_INSETS = -2, B_USE_ITEM_INSETS = -3,
B_USE_HALF_ITEM_SPACING = -3, B_USE_HALF_ITEM_SPACING = -4,
B_USE_HALF_ITEM_INSETS = -3, B_USE_HALF_ITEM_INSETS = -4,
B_USE_WINDOW_INSETS = -4, B_USE_WINDOW_INSETS = -5,
B_USE_WINDOW_SPACING = -4, B_USE_WINDOW_SPACING = -5,
B_USE_SMALL_INSETS = -5, B_USE_SMALL_INSETS = -6,
B_USE_SMALL_SPACING = -5, B_USE_SMALL_SPACING = -6,
B_USE_BIG_INSETS = -6, B_USE_BIG_INSETS = -7,
B_USE_BIG_SPACING = -6 B_USE_BIG_SPACING = -7
}; };
src/kits/interface/ControlLook.cpp
+1 -2
View File
@@ -53,8 +53,7 @@ BControlLook::DefaultItemSpacing() const
float float
BControlLook::ComposeSpacing(float spacing) BControlLook::ComposeSpacing(float spacing)
{ {
// We only need to check one of each synonym (B_*_SPACING | B_*_INSETS) if (spacing == B_USE_DEFAULT_SPACING || spacing == B_USE_ITEM_SPACING) {
if (spacing == B_USE_ITEM_SPACING) {
return be_control_look->DefaultItemSpacing(); return be_control_look->DefaultItemSpacing();
} else if (spacing == B_USE_HALF_ITEM_SPACING) { } else if (spacing == B_USE_HALF_ITEM_SPACING) {
return be_control_look->DefaultItemSpacing() * 0.5f; return be_control_look->DefaultItemSpacing() * 0.5f;