summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-07 15:15:52 -0800
committerJames Cook <james@lindenlab.com>2009-12-07 15:15:52 -0800
commit81c18d54426ffe8a331350ac975770f36b5df201 (patch)
treef9f9001125deb40141c52cdf593131d32b01a5e0 /indra/newview/skins
parent13c998c34ac2c1f134b4c6998413753f94e1a002 (diff)
EXT-3159 Mouse-wheel scrolling down causes unexpected side-scrolling
If vertical scroll bar is visible, give it the scroll events and don't scroll horizontally. Eliminated extraneous folder view item scroll handler. Reviewed with Richard.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_text_editor.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
index b0aa5c7c4f..8be0c28c5c 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -9,7 +9,6 @@
<text_editor
height="50"
follows="top|left|bottom"
- layout="topleft"
left="10"
name="test_text_editor"
tool_tip="text editor"
@@ -17,4 +16,15 @@
width="200">
Text Editor
</text_editor>
+ <text_editor
+ height="50"
+ follows="top|left|bottom"
+ font="SansSerif"
+ left="10"
+ name="test_text_editor"
+ tool_tip="text editor"
+ top_pad="10"
+ width="200">
+ This contains long text and should scroll horizontally to the right
+ </text_editor>
</floater>