Commit Graph

73 Commits (5bf17543c2f920509ff2ffe713f4fff6ae10bdae)

Author SHA1 Message Date
Lynx Linden 2ec69d6d71 EXT-4678: Revert URL black list support from LLTextBase.
The new <nolink>URL</nolink> provides a more flexible solution that
can be specified in XUI (as we now do to disabled hyperlinking for the
sim hostname in the About floater).
2010-01-29 14:56:39 +00:00
Lynx Linden 4d6c9e3e17 EXT-4678: Support <nolink>...</nolink> to turn off URL hyperlinking.
We are running into a bunch of places where we don't want to allow
hyperlinking of URLs like secondlife.com in text boxes. I've therefore
added a new type of URL regex that disables URL hyperlinking. Simply
enclose the URL in a <nolink> tag, e.g.:

  <nolink>secondlife.com</nolink>
2010-01-29 14:30:26 +00:00
Tofu Linden 3d771ed88b PE merge. 2010-01-26 10:36:27 -08:00
Dmitry Zaporozhan e8b4a14b1d Fixed major bug EXT-4719 - Crash in LLTextBase after showing popup menu for link.
--HG--
branch : product-engine
2010-01-26 17:07:12 +02:00
Lynx Linden 0a38adfd8a EXT-4678: Don't hyperlink sim URLs in About window.
Added support for specifying a black list of URLs on a per-widget
basis. URLs on this black list will not be hyperlinked in the text
widget. The About dialog adds the sim hostname to this black list.
2010-01-26 13:09:26 +00:00
Denis Serdjuk 410e105f52 fixed bug EXT-4433 [BSI] friend privacy settings greyed out
EXT-4353, EXT-4587, EXT-4442 have same cause.  it should fix they.

--HG--
branch : product-engine
2010-01-25 15:15:06 +02:00
richard cf2beaeea6 EXT-4380 - LLTextEditor: line_spacing.multiple option doesn't work well with "widgeted" text
partial fix

reviewed by Leyla
2010-01-15 13:16:58 -08:00
richard 4966073030 moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf

reviewed by Brad
2010-01-06 12:23:56 -08:00
Tofu Linden 183c991402 DEV-44614 ugly/broken font and formatting used for IM toast emotes
fix bug, also fix some comments/typos/enumparams in this code area.
2009-12-23 11:29:13 -08:00
richard 2b22831dd0 ext-3307 - nearby chat stays scrolled at bottom 2009-12-18 15:18:16 -08:00
richard 49a037048c oops, forgot to remove assert 2009-12-17 11:44:37 -08:00
richard 9abe9bf5df clamp instead of assert when running out of room during reflow 2009-12-17 11:44:01 -08:00
richard f452c01915 EXT-3087 - Crash when avatar icon truncated in interactive notifications
reviewed by Mani
2009-12-17 09:54:44 -08:00
richard 19d9cf8d8e ext-3404 - script editor scrolls to the bottom and sticks 2009-12-11 16:48:05 -08:00
richard 9ad76199e5 fixed a regression that caused bottom 15 pixels of scrollable text editors to appear blank 2009-12-11 16:25:38 -08:00
richard c6234f352a variable renames in LLTextBase 2009-12-11 14:34:30 -08:00
richard b8fdf82510 fix for ellipses not appearing in single line text widgets
fix for ellipses sometimes appearing at end of wrapped line of text

reviewed by James
2009-12-11 13:50:40 -08:00
richard 7a05356749 EXT-2572 - Bottom text on bottom line in nearby chat is clipped 2009-12-08 18:43:32 -08:00
richard 08233e283d added fading back to icons in text widgets 2009-12-08 14:34:44 -08:00
richard 9aa12417cb ext-3087 - avatar icon is truncated badly
reviewed by James
2009-12-08 14:08:58 -08:00
richard fdf8602d5f fix for inline widgets never shrinking with resizable text editor
also fixed dropping last line in chat history
2009-12-07 19:03:31 -08:00
richard 3cf11892e4 fix for horizontal scrolling in text_editors 2009-12-07 15:34:19 -08:00
richard 1d2a8e0f83 ext-3112 - bad font width information with sansserif 2009-12-07 13:00:40 -08:00
James Cook 2fe5e55f4f Hack for EXT-2971 Letter R doesn't show when it's the last letter in a text block.
Add 1 pixel of padding to clipping rect computation.  I think there is a deeper
problem in the font width computation code, but I don't know where.  Opened EXT-3112
for the deeper issue.  Reviewed with Leyla.
2009-12-03 15:20:21 -08:00
James Cook 6c2101a44e EXT-2984 Fixed crash in LLNormalTextSegment::getDimensions (no repro)
Avoid stepping off end of array when text segment has 0 characters
Reviewed with Ambroff
2009-12-03 09:32:05 -08:00
James Cook d5d1db8833 EXT-3015 Fixed right and center aligned text boxes
Document rect left edge was being computed incorrectly.
Made floater_test_textbox.xml have more examples of text.
Reviewed with Kelly
2009-12-01 11:29:33 -08:00
richard 9d52d15db8 fix for ellipses on a single line 2009-11-25 20:11:04 -08:00
richard 4885ddab8d EXT-1944 - Implement ellipsis in message well
EXT-699 - Toasts should display maximum 6 lines of text before ellipses are applied
EXT-2453 - TextBox displays an extra line of text
2009-11-25 19:55:24 -08:00
richard edcd835feb fixed line numbering in script editors 2009-11-25 19:14:55 -08:00
richard 617ca79ed0 forgot to apply resize fix for when text is selected
EXT-1995 - [BSI] Get rid of the *blop* sound when a textbox contains more text than displayable
2009-11-25 18:55:15 -08:00
richard cdb2232284 created container for LLFloaterView for future z-swapping with sidetray
floaters can now overlap sidetray
fixed text selection background color to be inverse of text fg color
EXT-2713 	Script editor automatically scrolls to the top of script text when text is longer than the window.

reviewed by James
2009-11-25 18:24:39 -08:00
Steve Bennetts 9e2d78aca1 Merge from product-engine 2009-11-24 12:42:14 -08:00
Mike Antipov 0ef5b128aa Work on critical sub-task EXT-2615 (IM Chat History is severely broken)
-- Improved calculating of the LLTextBase::mContentsRect to take into account "left" coordinate.
	Previous implementation just ignored it.

--HG--
branch : product-engine
2009-11-24 13:17:19 +02:00
richard dc88effc24 fix for infinite loop when doing /me emotes
reviewed by Mark
2009-11-23 11:44:03 -08:00
angela 496ad115b1 Fix EXT-2645 Ensure link colors applied consistently to all text sources 2009-11-20 09:47:47 +08:00
richard d2fe3e8089 merge 2009-11-17 14:37:55 -08:00
James Cook a2041387b1 Fix broken URL highlighting in local chat, broken in 5068 : ce08ac445035. Typo, not reviewed. 2009-11-17 10:02:01 -08:00
angela 0098bf40ea undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating 2009-11-17 16:33:49 +08:00
angela 1baf1d2186 fix chat format for /me 2009-11-16 20:46:40 +08:00
richard 890da1d391 fix for layout of urls with icons 2009-11-13 16:50:17 -08:00
angela ff09b049a7 merge 2009-11-12 21:36:34 +08:00
angela b1a81afef6 add optional style params in setText function 2009-11-12 21:17:31 +08:00
Vadim Savchuk db3991ca23 Merge from default branch
--HG--
branch : product-engine
2009-11-11 22:55:32 +02:00
richard b34ee7f9f4 merge 2009-11-11 12:21:23 -08:00
richard fedf86c216 fix wrapping of text segment containing multiple newlines and ending on a newline
reviewed by leyla
2009-11-11 12:01:57 -08:00
Vadim Savchuk 2fd51b4c71 Manual merge.
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp.

--HG--
branch : product-engine
2009-11-11 21:11:54 +02:00
Yuri Chebotarev 8523d2d5b6 fix for normal bug EXT-2303 Distinguish Object-generated Nearby Chat from other Nearby Chat
--HG--
branch : product-engine
2009-11-11 17:05:36 +02:00
Leyla Farazha d181b84dfd EXT-1478 Tool-tip background and border colors are being ignored
EXT-2082   	 Multifloater preview tab container extends outside window border
EXT-773   	 odd notecard behaviour on closing an unsaved notcard
reviewed by Richard
2009-11-10 17:10:47 -08:00
richard 83fb99a9ac ext-2038 - script editor, cursor becomes stuck in some rows
ext-2037 0 Script editor, garbage characters inserted in text
2009-11-04 18:28:45 -08:00
richard 5bcd24a01d merge 2009-11-04 10:42:23 -08:00