Skip to content

Commit 8ec67f5

Browse files
authored
Merge pull request #211 from magicskysword/fixed_input_field_cursor_pos
修复输入文本里,点击一行末尾的空白处时,会定位到下一行开头的问题
2 parents 2eef090 + 11da524 commit 8ec67f5

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

Assets/Scripts/Core/Text/InputTextField.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace FairyGUI
1313
public class InputTextField : RichTextField
1414
{
1515
/// <summary>
16-
///
16+
///
1717
/// </summary>
1818
public int maxLength { get; set; }
1919

@@ -24,37 +24,37 @@ public class InputTextField : RichTextField
2424
public bool keyboardInput { get; set; }
2525

2626
/// <summary>
27-
///
27+
///
2828
/// </summary>
2929
public int keyboardType { get; set; }
3030

3131
/// <summary>
32-
///
32+
///
3333
/// </summary>
3434
public bool hideInput { get; set; }
3535

3636
/// <summary>
37-
///
37+
///
3838
/// </summary>
3939
public bool disableIME { get; set; }
4040

4141
/// <summary>
42-
///
42+
///
4343
/// </summary>
4444
public bool mouseWheelEnabled { get; set; }
4545

4646
/// <summary>
47-
///
47+
///
4848
/// </summary>
4949
public static Action<InputTextField, string> onCopy;
5050

5151
/// <summary>
52-
///
52+
///
5353
/// </summary>
5454
public static Action<InputTextField> onPaste;
5555

5656
/// <summary>
57-
///
57+
///
5858
/// </summary>
5959
public static PopupMenu contextMenu;
6060

@@ -119,23 +119,23 @@ public InputTextField()
119119
}
120120

121121
/// <summary>
122-
///
122+
///
123123
/// </summary>
124124
public EventListener onChanged
125125
{
126126
get { return _onChanged ?? (_onChanged = new EventListener(this, "onChanged")); }
127127
}
128128

129129
/// <summary>
130-
///
130+
///
131131
/// </summary>
132132
public EventListener onSubmit
133133
{
134134
get { return _onSubmit ?? (_onSubmit = new EventListener(this, "onSubmit")); }
135135
}
136136

137137
/// <summary>
138-
///
138+
///
139139
/// </summary>
140140
public override string text
141141
{
@@ -152,7 +152,7 @@ public override string text
152152
}
153153

154154
/// <summary>
155-
///
155+
///
156156
/// </summary>
157157
public override TextFormat textFormat
158158
{
@@ -172,7 +172,7 @@ public override TextFormat textFormat
172172
}
173173

174174
/// <summary>
175-
///
175+
///
176176
/// </summary>
177177
public string restrict
178178
{
@@ -188,7 +188,7 @@ public string restrict
188188
}
189189

190190
/// <summary>
191-
///
191+
///
192192
/// </summary>
193193
public int caretPosition
194194
{
@@ -214,7 +214,7 @@ public int selectionEndIndex
214214
}
215215

216216
/// <summary>
217-
///
217+
///
218218
/// </summary>
219219
public string promptText
220220
{
@@ -234,7 +234,7 @@ public string promptText
234234
}
235235

236236
/// <summary>
237-
///
237+
///
238238
/// </summary>
239239
public bool displayAsPassword
240240
{
@@ -250,7 +250,7 @@ public bool displayAsPassword
250250
}
251251

252252
/// <summary>
253-
///
253+
///
254254
/// </summary>
255255
public bool editable
256256
{
@@ -264,7 +264,7 @@ public bool editable
264264
}
265265

266266
/// <summary>
267-
///
267+
///
268268
/// </summary>
269269
public int border
270270
{
@@ -277,7 +277,7 @@ public int border
277277
}
278278

279279
/// <summary>
280-
///
280+
///
281281
/// </summary>
282282
public int corner
283283
{
@@ -290,7 +290,7 @@ public int corner
290290
}
291291

292292
/// <summary>
293-
///
293+
///
294294
/// </summary>
295295
public Color borderColor
296296
{
@@ -303,7 +303,7 @@ public Color borderColor
303303
}
304304

305305
/// <summary>
306-
///
306+
///
307307
/// </summary>
308308
public Color backgroundColor
309309
{
@@ -337,7 +337,7 @@ void UpdateShape()
337337
}
338338

339339
/// <summary>
340-
///
340+
///
341341
/// </summary>
342342
/// <param name="start"></param>
343343
/// <param name="length">-1 means the rest count from start</param>
@@ -360,7 +360,7 @@ public void SetSelection(int start, int length)
360360
}
361361

362362
/// <summary>
363-
///
363+
///
364364
/// </summary>
365365
/// <param name="value"></param>
366366
public void ReplaceSelection(string value)
@@ -426,7 +426,7 @@ public void ReplaceSelection(string value)
426426
}
427427

428428
/// <summary>
429-
///
429+
///
430430
/// </summary>
431431
/// <param name="value"></param>
432432
public void ReplaceText(string value)
@@ -818,7 +818,7 @@ TextField.CharPosition GetCharPosition(Vector2 location)
818818
return v;
819819
}
820820
else if (firstInLine != -1)
821-
return v;
821+
return textField.charPositions[i - 1];
822822
}
823823

824824
return textField.charPositions[i - 1];

0 commit comments

Comments
 (0)