Skip to content
Snippets Groups Projects
Commit 1836dd12 authored by Richard Nelson's avatar Richard Nelson
Browse files

EXP-1149 FIX Log in Screen: Replace the new mode selector with the old one

improved graphics and layout for logged in mode selector
parent 2154bccd
Branches
Tags
No related merge requests found
...@@ -525,15 +525,12 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p) ...@@ -525,15 +525,12 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p)
else else
{ {
mButton->setRect(rect); mButton->setRect(rect);
mButton->setTabStop(TRUE);
mButton->setHAlign(LLFontGL::LEFT);
mButton->setLabel(mLabel.getString()); mButton->setLabel(mLabel.getString());
if (mTextEntry) if (mTextEntry)
{ {
mTextEntry->setVisible(FALSE); mTextEntry->setVisible(FALSE);
} }
mButton->setFollowsAll();
} }
} }
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
mouse_opaque="false" mouse_opaque="false"
name="location_combo" name="location_combo"
top_delta="0" top_delta="0"
width="246"> width="226">
<combo_list <combo_list
mouse_wheel_opaque="true"/> mouse_wheel_opaque="true"/>
<!-- *TODO: Delete. Let the location_input use the correct art sizes. <!-- *TODO: Delete. Let the location_input use the correct art sizes.
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
name="search_combo_box" name="search_combo_box"
tool_tip="Search" tool_tip="Search"
top_delta="0" top_delta="0"
width="220" > width="244" >
<combo_editor <combo_editor
label="Search [SECOND_LIFE]" label="Search [SECOND_LIFE]"
name="search_combo_editor"/> name="search_combo_editor"/>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</panel.string> </panel.string>
<panel <panel
height="18" height="18"
left="-335" left="-355"
width="95" width="95"
top="1" top="1"
follows="right|top" follows="right|top"
...@@ -79,10 +79,12 @@ ...@@ -79,10 +79,12 @@
</panel> </panel>
<combo_box <combo_box
follows="right|top" follows="right|top"
drop_down_button.pad_left="10"
left_pad="5" left_pad="5"
top="0" top="0"
width="100" width="120"
height="20" height="20"
pad_left="5"
name="mode_combo" name="mode_combo"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
> >
...@@ -96,6 +98,7 @@ ...@@ -96,6 +98,7 @@
value="" /> value="" />
</combo_box> </combo_box>
<text <text
left_pad="5"
type="string" type="string"
font="SansSerifSmall" font="SansSerifSmall"
text_readonly_color="TimeTextColor" text_readonly_color="TimeTextColor"
...@@ -104,7 +107,6 @@ ...@@ -104,7 +107,6 @@
height="16" height="16"
top="5" top="5"
layout="topleft" layout="topleft"
left_pad="5"
name="TimeText" name="TimeText"
tool_tip="Current time (Pacific)" tool_tip="Current time (Pacific)"
width="75"> width="75">
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
font="SansSerifSmall" font="SansSerifSmall"
scale_image="true" scale_image="true"
pad_right="24" pad_right="24"
halign="left"
tab_stop="true"
follows="all"
image_unselected="DropDown_Off" image_unselected="DropDown_Off"
image_selected="DropDown_On" image_selected="DropDown_On"
image_pressed="DropDown_Press" image_pressed="DropDown_Press"
......
...@@ -63,7 +63,7 @@ width="31" /> ...@@ -63,7 +63,7 @@ width="31" />
mouse_opaque="false" mouse_opaque="false"
name="location_combo" name="location_combo"
top_delta="0" top_delta="0"
width="350"> width="325">
</location_input> </location_input>
<icon follows="right" <icon follows="right"
height="20" height="20"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
name="status" name="status"
top="19" top="19"
tab_stop="false" tab_stop="false"
width="160"> width="185">
<panel.string <panel.string
name="packet_loss_tooltip"> name="packet_loss_tooltip">
Packet Loss Packet Loss
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
</panel.string> </panel.string>
<combo_box <combo_box
follows="right|top" follows="right|top"
left="5" left_pad="5"
drop_down_button.image_color="0 0 0 0" drop_down_button.pad_left="10"
drop_down_button.hover_glow_amount="0" left="0"
drop_down_button.pad_right="0" top="5"
top="7" pad_left="5"
width="95" width="120"
height="20" height="23"
name="mode_combo" name="mode_combo"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
> >
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment