Browse Source

removed autofocus and manually setting focus on the following dialogs: snap settings, new folder, create script, create resource, create component, rename asset

Shaddock Heath 9 years ago
parent
commit
fca78b5bd6

+ 2 - 3
Resources/EditorData/AtomicEditor/editor/ui/renameasset.tb.txt

@@ -6,10 +6,9 @@ TBLayout: axis: y, distribution: gravity, position: left
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout: gravity: left right, distribution-position: right bottom
 		TBTextField: text: "New Name:"
-		TBEditField: id: new_name, autofocus: 1
+		TBEditField: id: new_name
 			lp: min-width: 180
 	TBSeparator: gravity: left right, skin: AESeparator
-	TBLayout: 
+	TBLayout:
 		TBButton: text: Rename, id: rename
 		TBButton: text: Cancel, id: cancel
-		

+ 1 - 1
Resources/EditorData/AtomicEditor/editor/ui/resourcecreatecomponent.tb.txt

@@ -1,7 +1,7 @@
 TBLayout: axis: y, distribution: gravity, position: left
 	TBLayout:
 		TBTextField: text: "Component Name:"
-		TBEditField: id: component_name, autofocus: 1
+		TBEditField: id: component_name
 			lp: min-width: 180
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout: distribution: gravity

+ 1 - 1
Resources/EditorData/AtomicEditor/editor/ui/resourcecreateresource.tb.txt

@@ -1,7 +1,7 @@
 TBLayout: axis: y, distribution: gravity, position: left
 	TBLayout:
 		TBTextField: text: "Name:"
-		TBEditField: id: component_name, autofocus: 1
+		TBEditField: id: component_name
 			lp: min-width: 180
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout:

+ 1 - 1
Resources/EditorData/AtomicEditor/editor/ui/resourcecreatescript.tb.txt

@@ -1,7 +1,7 @@
 TBLayout: axis: y, distribution: gravity, position: left
 	TBLayout:
 		TBTextField: text: "Script Name:"
-		TBEditField: id: script_name, autofocus: 1
+		TBEditField: id: script_name
 			lp: min-width: 180
 	TBLayout: distribution: gravity
 		TBTextField: text: "Script Template:"

+ 3 - 4
Resources/EditorData/AtomicEditor/editor/ui/resourcenewfolder.tb.txt

@@ -1,10 +1,9 @@
 TBLayout: axis: y, distribution: gravity, position: left
-	TBLayout: 
+	TBLayout:
 		TBTextField: text: "Folder Name:"
-		TBEditField: id: folder_name, autofocus: 1
+		TBEditField: id: folder_name
 			lp: min-width: 180
 	TBSeparator: gravity: left right, skin: AESeparator
-	TBLayout: 
+	TBLayout:
 		TBButton: text: Create, id: create
 		TBButton: text: Cancel, id: cancel
-		

+ 2 - 2
Resources/EditorData/AtomicEditor/editor/ui/snapsettings.tb.txt

@@ -2,7 +2,7 @@ TBLayout: axis: y, distribution: gravity, position: left
 	TBLayout: distribution: gravity
 		TBTextField: text: "Translate X:"
 		TBLayout: gravity: left right, distribution-position: right bottom
-			TBEditField: id: trans_x, autofocus: 1, text-align: center
+			TBEditField: id: trans_x, text-align: center
 				lp: min-width: 100
 	TBLayout: distribution: gravity
 		TBTextField: text: "Translate Y:"
@@ -25,6 +25,6 @@ TBLayout: axis: y, distribution: gravity, position: left
 			TBEditField: id: scale, text-align: center
 				lp: min-width: 100
 	TBSeparator: gravity: left right, skin: AESeparator
-	TBLayout: 
+	TBLayout:
 		TBButton: text: Apply, id: apply
 		TBButton: text: Cancel, id: cancel

+ 1 - 0
Script/AtomicEditor/ui/modal/SnapSettingsWindow.ts

@@ -38,6 +38,7 @@ class SnapSettingsWindow extends ModalWindow {
 
         this.refreshWidgets();
 
+        this.transXEditField.setFocus();
     }
 
     apply() {

+ 6 - 0
Script/AtomicEditor/ui/modal/UIResourceOps.ts

@@ -93,6 +93,7 @@ export class CreateFolder extends ModalWindow {
         this.resourcePath = resourcePath;
         this.init("New Folder", "AtomicEditor/editor/ui/resourcenewfolder.tb.txt");
         this.nameField = <Atomic.UIEditField>this.getWidget("folder_name");
+        this.nameField.setFocus();
     }
 
     handleWidgetEvent(ev: Atomic.UIWidgetEvent) {
@@ -142,6 +143,7 @@ export class CreateComponent extends ModalWindow {
         this.nameField = <Atomic.UIEditField>this.getWidget("component_name");
         this.templateField = <Atomic.UISelectDropdown>this.getWidget("template_list");
         this.loadTemplatesList();
+        this.nameField.setFocus();
     }
 
     /**
@@ -228,6 +230,7 @@ export class CreateScript extends ModalWindow {
         this.nameField = <Atomic.UIEditField>this.getWidget("script_name");
         this.templateField = <Atomic.UISelectDropdown>this.getWidget("template_list");
         this.loadTemplatesList();
+        this.nameField.setFocus();
     }
 
     /**
@@ -312,6 +315,7 @@ export class CreateScene extends ModalWindow {
         this.resourcePath = resourcePath;
         this.init("New Scene", "AtomicEditor/editor/ui/resourcecreateresource.tb.txt");
         this.nameField = <Atomic.UIEditField>this.getWidget("component_name");
+        this.nameField.setFocus();
     }
 
     handleWidgetEvent(ev: Atomic.UIWidgetEvent) {
@@ -364,6 +368,7 @@ export class CreateMaterial extends ModalWindow {
         this.resourcePath = resourcePath;
         this.init("New Material", "AtomicEditor/editor/ui/resourcecreateresource.tb.txt");
         this.nameField = <Atomic.UIEditField>this.getWidget("component_name");
+        this.nameField.setFocus();
     }
 
     handleWidgetEvent(ev: Atomic.UIWidgetEvent) {
@@ -425,6 +430,7 @@ export class RenameAsset extends ModalWindow {
         this.resizeToFitContent();
         this.center();
 
+        this.nameEdit.setFocus();
     }
 
     handleWidgetEvent(ev: Atomic.UIWidgetEvent) {