summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/llui/lltextbase.cpp10
-rw-r--r--indra/newview/llviewerfloaterreg.cpp7
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_text_editor.xml20
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_textbox.xml17
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml41
5 files changed, 82 insertions, 13 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 741ab1737d..82a3c5cf47 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -543,9 +543,17 @@ void LLTextBase::drawText()
line_end = next_start;
}
+ // A patch for EXT-1944 "Implement ellipses in message well"
+ // introduced a regression where text in SansSerif ending in the
+ // letter "r" is clipped. This may be due to an off-by-one in
+ // font width information out of FreeType with our fractional font
+ // sizes. For now, just make an extra pixel of space to resolve
+ // EXT-2971 "Letter R doesn't show when it's the last letter in a
+ // text block". See James/Richard for details.
+ const S32 FIX_CLIPPING_HACK = 1;
LLRect text_rect(line.mRect.mLeft + mTextRect.mLeft - scrolled_view_rect.mLeft,
line.mRect.mTop - scrolled_view_rect.mBottom + mTextRect.mBottom,
- llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft,
+ llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft + FIX_CLIPPING_HACK,
line.mRect.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom);
// draw a single line of text
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index b5454e7298..7bff92fe98 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -226,7 +226,12 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml",
&LLFloaterReg::build<LLFloaterTestInspectors>);
//LLFloaterReg::add("test_list_view", "floater_test_list_view.xml",&LLFloaterReg::build<LLFloaterTestListView>);
- LLFloaterReg::add("test_widgets", "floater_test_widgets.xml", &LLFloaterReg::build<LLFloater>);
+ LLFloaterReg::add("test_textbox", "floater_test_textbox.xml",
+ &LLFloaterReg::build<LLFloater>);
+ LLFloaterReg::add("test_text_editor", "floater_test_text_editor.xml",
+ &LLFloaterReg::build<LLFloater>);
+ LLFloaterReg::add("test_widgets", "floater_test_widgets.xml",
+ &LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("top_objects", "floater_top_objects.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTopObjects>);
LLFloaterReg::add("reporter", "floater_report_abuse.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterReporter>);
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
new file mode 100644
index 0000000000..b0aa5c7c4f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="600"
+ layout="topleft"
+ name="floater_test_text_editor"
+ width="800">
+ <text_editor
+ height="50"
+ follows="top|left|bottom"
+ layout="topleft"
+ left="10"
+ name="test_text_editor"
+ tool_tip="text editor"
+ top="25"
+ width="200">
+ Text Editor
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 033070607b..8fc2677cbe 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -21,6 +21,21 @@ Third line of multiple lines
Fourth line of multiple lines
Fifth line of multiple lines
</text>
+ <text
+ clip_partial="true"
+ top_pad="10"
+ left="10"
+ width="267"
+ height="28"
+ layout="topleft"
+ follows="right|left"
+ text_color="white"
+ use_ellipses="true"
+ word_wrap="true"
+ mouse_opaque="false"
+ name="title" >
+ This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text
+ </text>
<text
font="SansSerif"
@@ -28,7 +43,7 @@ Fifth line of multiple lines
height="10"
layout="topleft"
left_delta="0"
- top_pad="40"
+ top_pad="10"
width="300">
SansSerif BOLD
</text>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 07940e18b6..a22dc80f4e 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -185,21 +185,42 @@
<menu_item_call.on_click
function="Advanced.ShowSideTray" />
</menu_item_call>
+ <menu
+ label="UI Tests"
+ name="UI Tests"
+ tear_off="true">
+ <menu_item_call
+ label="Textbox"
+ name="Textbox"
+ shortcut="control|1">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_textbox" />
+ </menu_item_call>
+ <menu_item_call
+ label="Text Editor"
+ name="Text Editor"
+ shortcut="control|2">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_text_editor" />
+ </menu_item_call>
<menu_item_call
- label="Widget Test"
- name="Widget Test"
+ label="Widgets"
+ name="Widgets"
shortcut="control|shift|T">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="test_widgets" />
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_widgets" />
</menu_item_call>
<menu_item_call
- label="Inspectors Test"
- name="Inspectors Test">
- <menu_item_call.on_click
- function="ShowFloater"
- parameter="test_inspectors" />
+ label="Inspectors"
+ name="Inspectors">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_inspectors" />
</menu_item_call>
+ </menu>
<menu_item_check
label="Reg In Client Test (restart)"
name="Reg In Client Test (restart)">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 13:26:38 +0000