summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-05 16:34:12 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-05 16:34:12 -0500
commit379bc7bd1db5a728a730f7e0e7d0a3bfbdfc3870 (patch)
tree1fcc28c339e30905c276556d2718a66dc6094db1 /indra/newview/skins/default/xui/en
parentad4102db1b0b6730d6d1fe7119cab2149bb48e2c (diff)
STEAM-14: login when user presses Enter at username or password.
The tricky thing about this fix is that the "Log In" button used to be in the same layout_panel as the username and password fields. Now it's not, so the fact that it's the default button for its layout_panel doesn't matter because that layout_panel doesn't have focus. Richard pointed out that we can make the commit action for the username and password fields initiate login -- as long as neither field implicitly runs its commit action when it loses focus!
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6c4cbd4627..134ca75018 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -69,12 +69,16 @@
width="150">
Username:
</text>
+ <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+ with focus in this combo_box, we can use commit action to initiate
+ login -->
<combo_box
allow_text_entry="true"
follows="left|bottom"
height="22"
left_delta="0"
max_chars="128"
+ commit_on_focus_lost="false"
combo_editor.prevalidate_callback="ascii"
tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
top_pad="0"
@@ -97,6 +101,9 @@
width="150">
Password:
</text>
+ <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+ with focus in this line_editor, we can use commit action to
+ initiate login -->
<line_editor
follows="left|bottom"
height="22"
@@ -104,6 +111,7 @@
name="password_edit"
is_password="true"
select_on_focus="true"
+ commit_on_focus_lost="false"
top_pad="0"
width="135" />
</layout_panel>