Commit Graph

172 Commits (afdcd356db0a496e8916645eeebc8a03755ee0bd)

Author SHA1 Message Date
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Paul ProductEngine 18aabdfd3d CHUI-127 FIXED (Make chat field auto resizable)
- Replaced LLLineEditor with newly created LLChatEntry
- Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes
2012-06-19 09:44:40 +03:00
Kitty Barnett a9d1121977 STORM-276 Added spellcheck functionality to the LLTextEditor control 2012-02-03 15:20:34 +01:00
Richard Linden 0aa2c7343a EXP-1512 FIX changing UI size changes cursor position in notecards 2011-12-08 20:36:47 -08:00
Dave Parks 8a8e9ccdb6 SH-2652 Don't allocate 6000+ strings every frame 2011-11-04 16:15:05 -05:00
Richard Nelson 09e179b238 param block cleanup
added Flag as value type
moved Batch to BatchBlock
renamed Choice to ChoiceBlock
made merging of parameters for ValueParams consistent (fillFrom and overwriteFrom are inverses of each other now)
made iteration over Multiple<T> type params easier
initial schema param blocks
2011-09-30 16:57:08 -07:00
Seth ProductEngine c94d687539 STORM-721 FIXED Fix for text clipping in a textbox without a scroller.
Committed on behalf of Richard Linden:
This patch makes clipping work consistently with text and embedded widgets. The widgets will only be displayed if the corresponding text they are embedded in is displayed.  There is also a new param "clip" for text widgets that can be used to disable clipping entirely.  I introduced this as a potential work around due to the fact that we *used* to assume that text was never clipped in the vertical direction unless we had scrolling turned on.  This hasn't been the case for over a year, but now we can selectively turn off vertical text clipping with (clip="false") if we have to.
2011-04-10 00:31:52 +03:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Richard Nelson d72a21aca1 further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Andrew Dyukov 4919f0b341 EXT-8010 FIXED Implemented special behaviour of avatar links.
Avatar links are now underlined only on hover. Also they have the same color as other links.

- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).

- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/

--HG--
branch : product-engine
2010-07-26 18:10:29 +03:00
Leyla Farazha d603085c03 Merge with dessie/viewer-release 2010-07-19 17:22:12 -07:00
Richard Linden 5eaab96a0b EXT-8465 FIX Text selection is often unreadable 2010-07-16 17:11:51 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Richard Linden 2c722547ea changed allow_html to parse_urls to be clearer about its meaning
allow_html still supported as alternate
2010-07-15 10:20:06 -07:00
Richard Linden 1f79bee86e EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit

reviewed by Vir
2010-07-09 14:26:56 -07:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Yuri Chebotarev 04838e411b merge
--HG--
branch : product-engine
2010-07-02 15:27:08 +03:00
Yuri Chebotarev 0cf9168895 EXT-5692 FIX Add callback to create widget segment with LLAvatarIconCtrl (or LLGroupIconCtrl) based on url match id.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/610/

--HG--
branch : product-engine
2010-07-02 15:23:05 +03:00
Richard Linden 187a4b638d EXT-7654 - About Land Floater> Icons missing
fixed layout of embedded icons in text labels
2010-07-01 19:48:39 -07:00
Leyla Farazha c897061856 Merge with q/viewer-release 2010-06-21 10:21:52 -07:00
Yuri Chebotarev f26eb91c44 EXT-7766 FIX change the order of processing url matching and linebreaks
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/596/

--HG--
branch : product-engine
2010-06-18 10:49:09 +03:00
Yuri Chebotarev 884e08b509 EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image segment from being created if this flag is set.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/587/

--HG--
branch : product-engine
2010-06-18 10:47:49 +03:00
Yuri Chebotarev 75d3856811 EXT-7654 FIX "AddText" didn't create image segment now, use appendImageSegment
reviewed by Richard Nelson, Vadim Savchuk at https://codereview.productengine.com/secondlife/r/616/

--HG--
branch : product-engine
2010-06-22 15:50:34 +03:00
Yuri Chebotarev 6bbe55558f EXT-7623 FIX One more place where text was processed into segments without LLLineBreakSegment.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/

--HG--
branch : product-engine
2010-06-07 12:56:29 +03:00
Richard Linden f79ac664dd merge 2010-06-03 14:15:11 -07:00
Yuri Chebotarev 5c263cdc64 EXT-6333 FIX introduce new segments - LLLineBreakSegment and LLImageSegment
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/241/

--HG--
branch : product-engine
2010-06-03 10:38:03 +03:00
Richard Nelson 7435ff08b5 DEV-50271 FIX SLURL support for non-clickable display names
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
2010-05-26 13:14:47 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
James Cook fe8d015851 Merge 2010-03-02 14:06:23 -08:00
Monroe Linden ef9b7c5b36 Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby chat window opens the link".
Added an optional bool parameter "hit_past_end_of_line" to LLTextBase:: getDocIndexFromLocalCoord() and getSegmentAtLocalPos().  Default is true, which gives the old behavior.  If false, clicks past the end-of-line won't map to the last segment on the line.

Made LLNormalTextSegment::handleHover(), handleRightMouseDown(), handleMouseDown(), and handleMouseUp() call getSegmentAtLocalPos() in this new mode before processing URL actions, and only do the processing if it returns the same segment.

Reviewed by Richard.
2010-02-18 15:45:31 -08:00
James Cook c16591c046 Per-avatar customizable icons next to name links in text
Changed LLUrlEntryAgent callbacks to handle both link label and icon
Eliminated legacy LLNameCache file loading
Reviewed with Kelly
2010-02-12 16:12:12 -08:00
Monroe Linden 5491dd6e98 Further fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client).
This should fix the inefficiencies in the append path that made viewer FPS drop severely when addinglarge amounts of text to the nearby chat floater.

Resizing the floater with a huge amount of text in it is still pretty bad, but fixing that will require some bigger architectural changes.

Changed LLTextBase::needsReflow() to take an offset at which to start reflow processing.

Changed most needsReflow() calls in LLTextBase to supply a proper index.

Changed LLTextBase::reflow() to use the reflow index maintained by needsReflow().

Removed all needsReflow() calls from LLTextEditor (the only way for it to manipulate the text is through functions in LLTextBase that already manage reflowing internally).

Removed LLTextEditor::replaceUrlLabel(), since it was identical to the inherited version LLTextBase::replaceUrlLabel().

Reviewed by Richard.
2010-02-02 18:24:11 -08:00
Dmitry Zaporozhan 38315a063d Fixed normal bug EXT-4740 - Object inspector hides however context menu present
--HG--
branch : product-engine
2010-02-02 14:25:31 +02:00
Monroe Linden 4ad357ec70 Fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client)
Removed some unnecessary string copies in LLTextBase and LLNormalTextSegment by changing getWText() to return const LLWString& (instead of LLWString), and storing the result in a const LLWString& instead of an LLWString in places where the string doesn't need to be modified.

Made LLTextViewModel::getDisplay() also return const LLWString& instead of LLWString.

Removed a couple of unused local string variables in LLTextBase (the compiler flagged these after converting the local copies to const LLWString&).
2010-02-01 17:51:30 -08:00
richard 45e700cb3e merge 2010-02-01 12:39:59 -08:00
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 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
angela 66e7c2ce77 fix mac build failure -- richard 2010-01-26 06:48:42 +08:00
richard 337716d946 LLPointer cleanup and fix for EXT-4413
reviewed by Rick
2010-01-22 16:51:13 -08:00
Mike Antipov 46948d9fcc Work on normal task EXT-3636 (Code Improvements: Voice control panels - Make Voice states and fade timeout xml driven)
-- made Avatar Item Voice States xml driven. Added fake xml panel file with one textbox per style.
  Style of the appropriate textbox is applied to avatar item's name
-- It was necessary to change visibility of the LLTExtBase::getDefaultStyle() to public.

--HG--
branch : product-engine
2009-12-23 20:00:48 +02:00
richard 2b22831dd0 ext-3307 - nearby chat stays scrolled at bottom 2009-12-18 15:18:16 -08:00
richard c6234f352a variable renames in LLTextBase 2009-12-11 14:34:30 -08:00
richard 9aa12417cb ext-3087 - avatar icon is truncated badly
reviewed by James
2009-12-08 14:08:58 -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
Dmitry Oleshko aba8b04cfc fix of a normal bug (EXT-2448) [BSI] Notification toasts should resize when text is to long to be displayed
A maximum number of characters for textbox/texteditor could be set only through XML.
In case when a corresponding attribute was absent - the maximun number was set to 255, and there were no chance (no function) to change it.
So in this fix such a function was added.

--HG--
branch : product-engine
2009-11-16 18:51:54 +02: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
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
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 b82bda605d EXT-2018 PRofile "Real World" descripton scrolls before showing "More" link
EXT-2011 titles of IM sessions aren't aligned to center
EXT-3025 Pick's description overlaps picks name
also moved tool tip param default to tool_tip.xml
also made default param<const LLFontGL*> be SansSerif

reviewed by Leyla
2009-10-30 17:46:01 -07:00
richard bb9fe04b5f EXT-1949 - Viewer freezes on resizing IM window
cleaned up some rectangle tracking logic and introduced LLInlineViewSegment param block
reviewed by Leyla
2009-10-28 11:48:10 -07:00
richard 977dd84534 tweaked clipping rect for scroll containers to not overlap vertical scrollbar
fixed reflow logic when resizing text editors that contain widgets (would make text appear and disappear)

reviewed by James
2009-10-26 14:25:45 -07:00
Richard Nelson b3d1eb82fa fix for chat history layout bugs
EXT-1728 - there is no new line in the text copied on junction of 2 panels
EXT-1670 - fix chat history use of widgets

reviewed by James
2009-10-21 21:30:40 +00:00
Richard Nelson ce5a5f84d5 ext-1670 - fix the chat history use of widgets
reviewed by leyla
2009-10-20 00:41:41 +00:00
Richard Nelson f8997965eb fixed first click on SLURL not spawning inspector by handling mouse down when clicking on url
reviewed by Mani
2009-10-16 01:49:34 +00:00
Richard Nelson fd846da06c only add LLScrollContainers to text widgets when requested, saving on LLTextBox construction time
combined clip and scroll attributes of text editors and text boxes...if you want to clip text, you need to introduce a scrollbar
moved clear to LLTextEditor so that text boxes won't empty out when calling LLPanel::clearCtrls()
EXT-1354 - added optional wrapping to LLTooltips...inspector tooltips don't wrap, everything else does
added LLFastTimer::reset call on application init to prime timers for pre-login timing
fixed tooltips positioning incorrectly due to mis-sized tooltipview
eliminated hide_scrollbar param for text editors

reviewed by Leyla
2009-10-08 01:48:50 +00:00
Richard Nelson 606311b508 text boxes are now *not* mouse_opaque by default
fixed some textbox and text editor layout problems (getWidth called with wrong index)
EXT-1302 - rewrite LLExpandableTextBox to use new LLTextBase functionality (using custom LLExpanderSegment)

reviewed by James
2009-10-05 20:53:51 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Martin Reddy 330840af7c Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls
in text editors and textboxes, with right-click context menus,
tooltips, and alternate link labels. This includes alert boxes, the
login progress window, local chat and IM interfaces, etc. As well as
context menus for avatars and groups in list widgets. Includes fixes
for the following individual JIRAs:

DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)!
DEV-38829 EXT-742: Remove LLLink class
DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly
DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls
DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat
DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw
DEV-10353: URLs in chat log terminated incorrectly when newline in chat
DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs
DEV-36192: Need a way to copy Avatar names and Group names
DEV-2926: Allow viewer hyperlinks to have different text than the actual url
DEV-27253: Add easy way to copy URLs from viewer chat
DEV-38274: Make About Second Life window use new Url hyperlinking features
DEV-39076: No url support in Text Editors
DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access
DEV-7475: Add hyperlinks to notecards!
DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click

Master JIRA issues: DEV-32819, DEV-323820, DEV-7474

Testing performed against QAR-1789

svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
2009-09-04 12:11:27 +00:00