Browse Source

Formatting

Josh Engebretson 10 years ago
parent
commit
a5a8f27a7e

+ 0 - 4
Source/AtomicEditor/Source/Import/AEJSONSceneProcess.cpp

@@ -197,10 +197,6 @@ bool JSONSceneProcess::WriteHierarchy(Scene* scene)
         itr++;
     }
 
-    // TODO: only add proc sky to outdoor scenes
-    //Atomic::Node* skyNode = scene->CreateChild("ProcSky");
-    //skyNode->CreateComponent<ProcSky>();
-
     File file(context_);
 
     bool useXML = true;

+ 3 - 0
Source/AtomicEditor/Source/UI/UIInspectorDataBinding.cpp

@@ -270,12 +270,14 @@ InspectorDataBinding* InspectorDataBinding::Create(Serializable* object, const A
     else if (attrInfo->type_ == VAR_STRING)
     {
         TBEditField* field = new TBEditField();
+        field->SetTextAlign(TB_TEXT_ALIGN_CENTER);
         field->SetFontDescription(fd);
         widget = field;
     }
     else if (attrInfo->type_ == VAR_FLOAT)
     {
         TBEditField* field = new TBEditField();
+        field->SetTextAlign(TB_TEXT_ALIGN_CENTER);
         field->SetFontDescription(fd);
         widget = field;
     }
@@ -310,6 +312,7 @@ InspectorDataBinding* InspectorDataBinding::Create(Serializable* object, const A
         else
         {
             TBEditField* field = new TBEditField();
+            field->SetTextAlign(TB_TEXT_ALIGN_CENTER);
             field->SetFontDescription(fd);
             widget = field;
         }

+ 9 - 3
Source/AtomicEditor/Source/UI/UIInspectorFrame.cpp

@@ -144,14 +144,13 @@ void InspectorFrame::InspectNode(Node* node)
 
             TBLayout* attrsVerticalLayout = new TBLayout(AXIS_Y);
             attrsVerticalLayout->SetGravity(WIDGET_GRAVITY_ALL);
+            attrsVerticalLayout->SetLayoutDistribution(LAYOUT_DISTRIBUTION_GRAVITY);
             attrsVerticalLayout->SetLayoutPosition(LAYOUT_POSITION_LEFT_TOP);
 
             TBTextField* cnameField = new TBTextField();
             cnameField->SetText(c->GetTypeName().CString());
-            //cnameField->SetFontDescription(fd);
             attrsVerticalLayout->AddChild(cnameField);
 
-
             componentContainer->AddChild(attrsVerticalLayout);
 
             const Vector<AttributeInfo>* attrs = c->GetAttributes();
@@ -170,17 +169,24 @@ void InspectorFrame::InspectNode(Node* node)
                         TBLayout* attrLayout = new TBLayout();
 
                         attrLayout->SetLayoutDistribution(LAYOUT_DISTRIBUTION_GRAVITY);
-                        TBTextField* name = new TBTextField();
 
+                        TBTextField* name = new TBTextField();
                         String bname = attr->name_;
                         if (bname == "Is Enabled")
                             bname = "Enabled";
 
+                        name->SetTextAlign(TB_TEXT_ALIGN_LEFT);
                         name->SetText(bname.CString());
                         name->SetFontDescription(fd);
 
+                        LayoutParams lp;
+                        lp.SetWidth(140);
+                        name->SetLayoutParams(lp);
+
                         attrLayout->AddChild(name);
+
                         TBWidget* bwidget = binding->GetWidget();
+
                         attrLayout->AddChild(bwidget);
 
                         attrsVerticalLayout->AddChild(attrLayout);