Browse Source

Better looking input box

Marko Pintera 11 years ago
parent
commit
abb34d4a59
3 changed files with 18 additions and 23 deletions
  1. 9 11
      BansheeEditor/Source/BsEditorGUI.cpp
  2. 9 11
      BansheeEngine/Source/BsBuiltinResources.cpp
  3. 0 1
      Inspector.txt

+ 9 - 11
BansheeEditor/Source/BsEditorGUI.cpp

@@ -315,18 +315,16 @@ namespace BansheeEditor
 		inputBoxStyle.hover.texture = getTexture(InputBoxHoverTex);
 		inputBoxStyle.hover.texture = getTexture(InputBoxHoverTex);
 		inputBoxStyle.focused.texture = getTexture(InputBoxFocusedTex);
 		inputBoxStyle.focused.texture = getTexture(InputBoxFocusedTex);
 		inputBoxStyle.active.texture = inputBoxStyle.normal.texture;
 		inputBoxStyle.active.texture = inputBoxStyle.normal.texture;
-		inputBoxStyle.border.left = 5;
-		inputBoxStyle.border.right = 5;
-		inputBoxStyle.border.top = 5;
-		inputBoxStyle.border.bottom = 5;
-		inputBoxStyle.margins.left = 4;
-		inputBoxStyle.margins.right = 4;
-		inputBoxStyle.margins.top = 4;
-		inputBoxStyle.margins.bottom = 4;
-		inputBoxStyle.contentOffset.left = 2;
-		inputBoxStyle.contentOffset.right = 2;
+		inputBoxStyle.border.left = 1;
+		inputBoxStyle.border.right = 1;
+		inputBoxStyle.border.top = 1;
+		inputBoxStyle.border.bottom = 1;
+		inputBoxStyle.contentOffset.left = 3;
+		inputBoxStyle.contentOffset.right = 3;
+		inputBoxStyle.contentOffset.top = 2;
+		inputBoxStyle.contentOffset.bottom = 2;
 		inputBoxStyle.fixedHeight = true;
 		inputBoxStyle.fixedHeight = true;
-		inputBoxStyle.height = 21;
+		inputBoxStyle.height = 15;
 		inputBoxStyle.minWidth = 10;
 		inputBoxStyle.minWidth = 10;
 		inputBoxStyle.font = font;
 		inputBoxStyle.font = font;
 		inputBoxStyle.fontSize = DefaultFontSize;
 		inputBoxStyle.fontSize = DefaultFontSize;

+ 9 - 11
BansheeEngine/Source/BsBuiltinResources.cpp

@@ -236,18 +236,16 @@ namespace BansheeEngine
 		inputBoxStyle.hover.texture = getSkinTexture(InputBoxHoverTex);
 		inputBoxStyle.hover.texture = getSkinTexture(InputBoxHoverTex);
 		inputBoxStyle.focused.texture = getSkinTexture(InputBoxFocusedTex);
 		inputBoxStyle.focused.texture = getSkinTexture(InputBoxFocusedTex);
 		inputBoxStyle.active.texture = inputBoxStyle.normal.texture;
 		inputBoxStyle.active.texture = inputBoxStyle.normal.texture;
-		inputBoxStyle.border.left = 5;
-		inputBoxStyle.border.right = 5;
-		inputBoxStyle.border.top = 5;
-		inputBoxStyle.border.bottom = 5;
-		inputBoxStyle.margins.left = 4;
-		inputBoxStyle.margins.right = 4;
-		inputBoxStyle.margins.top = 4;
-		inputBoxStyle.margins.bottom = 4;
-		inputBoxStyle.contentOffset.left = 2;
-		inputBoxStyle.contentOffset.right = 2;
+		inputBoxStyle.border.left = 1;
+		inputBoxStyle.border.right = 1;
+		inputBoxStyle.border.top = 1;
+		inputBoxStyle.border.bottom = 1;
+		inputBoxStyle.contentOffset.left = 3;
+		inputBoxStyle.contentOffset.right = 3;
+		inputBoxStyle.contentOffset.top = 2;
+		inputBoxStyle.contentOffset.bottom = 2;
 		inputBoxStyle.fixedHeight = true;
 		inputBoxStyle.fixedHeight = true;
-		inputBoxStyle.height = 21;
+		inputBoxStyle.height = 15;
 		inputBoxStyle.minWidth = 10;
 		inputBoxStyle.minWidth = 10;
 		inputBoxStyle.font = font;
 		inputBoxStyle.font = font;
 		inputBoxStyle.fontSize = DefaultFontSize;
 		inputBoxStyle.fontSize = DefaultFontSize;

+ 0 - 1
Inspector.txt

@@ -21,7 +21,6 @@ Other:
 
 
 REFACTOR c++ GUI a bit:
 REFACTOR c++ GUI a bit:
  - Add new graphic for input boxes and add object field graphics
  - Add new graphic for input boxes and add object field graphics
- - Add "padding" to GUIElementStyle and make sure GUILayout (and whatever else) uses it
  - GameObjectField
  - GameObjectField
    - When dragging over GameObjectField cursor needs to change depending whether drop will be accepted or not
    - When dragging over GameObjectField cursor needs to change depending whether drop will be accepted or not
    - How will I limit it to just certain component types?
    - How will I limit it to just certain component types?