fix typo

xiaoguzhu · xiaoguzhu · commit 1b845683bf3a · 2021-02-02T17:07:18.000+08:00
diff --git a/Assets/Scripts/Core/DisplayObject.cs b/Assets/Scripts/Core/DisplayObject.cs
@@ -956,7 +956,7 @@ internal bool _AcceptTab()
                 && ((_flags & Flags.TabStop) != 0 || (_flags & Flags.TabStopChildren) != 0)
                 && (_flags & Flags.NotFocusable) == 0)
             {
-                Stage.inst.SetFous(this, true);
+                Stage.inst.SetFocus(this, true);
                 return true;
             }
             else
diff --git a/Assets/Scripts/Core/Stage.cs b/Assets/Scripts/Core/Stage.cs
@@ -269,11 +269,11 @@ public DisplayObject focus
             }
             set
             {
-                SetFous(value);
+                SetFocus(value);
             }
         }
 
-        public void SetFous(DisplayObject newFocus, bool byKey = false)
+        public void SetFocus(DisplayObject newFocus, bool byKey = false)
         {
             if (newFocus == this)
                 newFocus = null;
@@ -751,12 +751,12 @@ internal void InternalUpdate()
                     if (_nextFocus.tabStopChildren)
                     {
                         if (_nextFocus._lastFocus != null && _nextFocus.IsAncestorOf(_nextFocus._lastFocus))
-                            SetFous(_nextFocus._lastFocus);
+                            SetFocus(_nextFocus._lastFocus);
                         else
-                            SetFous(_nextFocus);
+                            SetFocus(_nextFocus);
                     }
                     else
-                        SetFous(_nextFocus);
+                        SetFocus(_nextFocus);
                 }
                 _nextFocus = null;
             }
@@ -995,7 +995,7 @@ void HandleTextInput()
                     }
 
                     if (_keyboard.done)
-                        SetFous(null);
+                        SetFocus(null);
                 }
             }
             else
@@ -1025,7 +1025,7 @@ void HandleCustomInput()
                     _touchCount = 1;
                     touch.Begin();
                     touch.button = 0;
-                    SetFous(touch.target);
+                    SetFocus(touch.target);
 
                     touch.UpdateEvent();
                     touch.target.BubbleEvent("onTouchBegin", touch.evt);
@@ -1067,7 +1067,7 @@ void HandleMouseEvents()
                     _touchCount = 1;
                     touch.Begin();
                     touch.button = Input.GetMouseButtonDown(2) ? 2 : (Input.GetMouseButtonDown(1) ? 1 : 0);
-                    SetFous(touch.target);
+                    SetFocus(touch.target);
 
                     touch.UpdateEvent();
                     touch.target.BubbleEvent("onTouchBegin", touch.evt);
@@ -1143,7 +1143,7 @@ void HandleTouchEvents()
                         _touchCount++;
                         touch.Begin();
                         touch.button = 0;
-                        SetFous(touch.target);
+                        SetFocus(touch.target);
 
                         touch.UpdateEvent();
                         touch.target.BubbleEvent("onTouchBegin", touch.evt);
diff --git a/Assets/Scripts/UI/GObject.cs b/Assets/Scripts/UI/GObject.cs
@@ -1017,7 +1017,7 @@ public bool focused
         public void RequestFocus()
         {
             if (displayObject != null)
-                Stage.inst.SetFous(displayObject, false);
+                Stage.inst.SetFocus(displayObject, false);
         }
 
         /// <summary>
@@ -1026,7 +1026,7 @@ public void RequestFocus()
         public void RequestFocus(bool byKey)
         {
             if (displayObject != null)
-                Stage.inst.SetFous(displayObject, byKey);
+                Stage.inst.SetFocus(displayObject, byKey);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ internal bool _AcceptTab()`
`956`	`956`	`&& ((_flags & Flags.TabStop) != 0 \|\| (_flags & Flags.TabStopChildren) != 0)`
`957`	`957`	`&& (_flags & Flags.NotFocusable) == 0)`
`958`	`958`	`{`
`959`		`- Stage.inst.SetFous(this, true);`
	`959`	`+ Stage.inst.SetFocus(this, true);`
`960`	`960`	`return true;`
`961`	`961`	`}`
`962`	`962`	`else`
Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,11 @@ public DisplayObject focus`
`269`	`269`	`}`
`270`	`270`	`set`
`271`	`271`	`{`
`272`		`- SetFous(value);`
	`272`	`+ SetFocus(value);`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`276`		`- public void SetFous(DisplayObject newFocus, bool byKey = false)`
	`276`	`+ public void SetFocus(DisplayObject newFocus, bool byKey = false)`
`277`	`277`	`{`
`278`	`278`	`if (newFocus == this)`
`279`	`279`	`newFocus = null;`
`@@ -751,12 +751,12 @@ internal void InternalUpdate()`
`751`	`751`	`if (_nextFocus.tabStopChildren)`
`752`	`752`	`{`
`753`	`753`	`if (_nextFocus._lastFocus != null && _nextFocus.IsAncestorOf(_nextFocus._lastFocus))`
`754`		`- SetFous(_nextFocus._lastFocus);`
	`754`	`+ SetFocus(_nextFocus._lastFocus);`
`755`	`755`	`else`
`756`		`- SetFous(_nextFocus);`
	`756`	`+ SetFocus(_nextFocus);`
`757`	`757`	`}`
`758`	`758`	`else`
`759`		`- SetFous(_nextFocus);`
	`759`	`+ SetFocus(_nextFocus);`
`760`	`760`	`}`
`761`	`761`	`_nextFocus = null;`
`762`	`762`	`}`
`@@ -995,7 +995,7 @@ void HandleTextInput()`
`995`	`995`	`}`
`996`	`996`
`997`	`997`	`if (_keyboard.done)`
`998`		`- SetFous(null);`
	`998`	`+ SetFocus(null);`
`999`	`999`	`}`
`1000`	`1000`	`}`
`1001`	`1001`	`else`
`@@ -1025,7 +1025,7 @@ void HandleCustomInput()`
`1025`	`1025`	`_touchCount = 1;`
`1026`	`1026`	`touch.Begin();`
`1027`	`1027`	`touch.button = 0;`
`1028`		`- SetFous(touch.target);`
	`1028`	`+ SetFocus(touch.target);`
`1029`	`1029`
`1030`	`1030`	`touch.UpdateEvent();`
`1031`	`1031`	`touch.target.BubbleEvent("onTouchBegin", touch.evt);`
`@@ -1067,7 +1067,7 @@ void HandleMouseEvents()`
`1067`	`1067`	`_touchCount = 1;`
`1068`	`1068`	`touch.Begin();`
`1069`	`1069`	`touch.button = Input.GetMouseButtonDown(2) ? 2 : (Input.GetMouseButtonDown(1) ? 1 : 0);`
`1070`		`- SetFous(touch.target);`
	`1070`	`+ SetFocus(touch.target);`
`1071`	`1071`
`1072`	`1072`	`touch.UpdateEvent();`
`1073`	`1073`	`touch.target.BubbleEvent("onTouchBegin", touch.evt);`
`@@ -1143,7 +1143,7 @@ void HandleTouchEvents()`
`1143`	`1143`	`_touchCount++;`
`1144`	`1144`	`touch.Begin();`
`1145`	`1145`	`touch.button = 0;`
`1146`		`- SetFous(touch.target);`
	`1146`	`+ SetFocus(touch.target);`
`1147`	`1147`
`1148`	`1148`	`touch.UpdateEvent();`
`1149`	`1149`	`touch.target.BubbleEvent("onTouchBegin", touch.evt);`
Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,7 @@ public bool focused`
`1017`	`1017`	`public void RequestFocus()`
`1018`	`1018`	`{`
`1019`	`1019`	`if (displayObject != null)`
`1020`		`- Stage.inst.SetFous(displayObject, false);`
	`1020`	`+ Stage.inst.SetFocus(displayObject, false);`
`1021`	`1021`	`}`
`1022`	`1022`
`1023`	`1023`	`/// <summary>`
`@@ -1026,7 +1026,7 @@ public void RequestFocus()`
`1026`	`1026`	`public void RequestFocus(bool byKey)`
`1027`	`1027`	`{`
`1028`	`1028`	`if (displayObject != null)`
`1029`		`- Stage.inst.SetFous(displayObject, byKey);`
	`1029`	`+ Stage.inst.SetFocus(displayObject, byKey);`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`	`1032`	`/// <summary>`