Commit Graph

12 Commits

Author SHA1 Message Date
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Nick Darnell
90e793745c Slate - ESlateCheckBoxState has been renamed to ECheckBoxState.
[CL 2384008 by Nick Darnell in Main branch]
2014-12-10 14:24:09 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Thomas Sarkanen
6f1d963577 Adding image support to tutorial rich text
Improved text layout support when inserting runs/text or splitting lines on runs that were non-text (images or widgets). The text layout now inserts an extra text run when splitting a non-text run, which avoids issues where text was either being inserted into a non-text run (and vanishing), or an image run was being cloned (and appearing twice).

This also fixes the cursor movement in the multiline editable text when selecting over images or widgets (the cursor would jump to the start of the document as GetTextIndexAt hadn't been implemented. Additionally, it also fixes an issue where Measure was always trying to place the cursor at the end of an image run (ignoring the values of BeginIndex and EndIndex) which made the cursor offset draw in the wrong place.

These changes required the text layout to be able to create a default text run, which involved refactoring the text marshallers as the Slate text run now knows about the default text style, taking that responsibility away from the marshallers

Added tutorial-specific image decorator that accepts a content-relative or engine relative image path.

Added button to tutorial rich text editor to add new images.

All previously-imported images should still 'work'.

reviewed by Jamie.Dale,Nick.Atamas,Justin.Sargent

[CL 2302278 by Thomas Sarkanen in Main branch]
2014-09-18 08:09:29 -04:00
Thomas Sarkanen
10a75d18a2 CIS fix - Fixed non-unity build
[CL 2294915 by Thomas Sarkanen in Main branch]
2014-09-12 05:38:38 -04:00
Thomas Sarkanen
a37b84b8c8 Rich tooltips for tutorial hyperlinks
Refactored handling of decorators into new utility class FTutorialText.
Added tooltip (and rich tooltip) support to hyperlink runs.

#codereview Jamie.Dale

[CL 2294907 by Thomas Sarkanen in Main branch]
2014-09-12 05:28:34 -04:00
Thomas Sarkanen
3507b199f2 CIS fix - initialisation order
[CL 2284585 by Thomas Sarkanen in Main branch]
2014-09-04 11:15:01 -04:00
Thomas Sarkanen
fa824aad40 Added more hyperlink types for tutorials
Added asset, code, tutorial and UDN hyperlinks. Tweaked UI to use combo box instead of the large amount of radio buttons it was using before.
Made sure importer & content use correct text styles.
Defaulted to rich text for content.

[CL 2284444 by Thomas Sarkanen in Main branch]
2014-09-04 09:59:45 -04:00
Thomas Sarkanen
7b3ae59c60 Simplified rich text editor for tutorials.
Removed ability to independently set font size & colour etc. and replaced with a set of font styles we can use (and style appropriately). Added legacy code to deal with old-style text as best it can.

[CL 2282800 by Thomas Sarkanen in Main branch]
2014-09-03 06:25:58 -04:00
Thomas Sarkanen
8dc16308f3 Added tutorials button in top bar of editor & sub-editors
Icon is only visible if content is available for the editor in question.
Split editor settings into two groups - one is persistent settings and one is progress/state.
Tutorials record their dismissed state, so users can permenantly disable the 'nag' for a particular tutorial.
Tutorial content now solidifies when the mouse is hovered over it, so it can be made easier to read.
Fixed crash on startup if an intro tutorial was displaying rich text.
Also fixed crash for TTP# 345094, where a zero-length tutorial was being accessed.

[CL 2275934 by Thomas Sarkanen in Main branch]
2014-08-28 06:22:40 -04:00
Joe Conley
3b9ec493d5 Fix CIS
#codereview Thomas.Sarkanen

[CL 2257552 by Joe Conley in Main branch]
2014-08-15 01:10:25 -04:00
Thomas Sarkanen
ac41c0f17f CIS fix - files I missed
[CL 2256056 by Thomas Sarkanen in Main branch]
2014-08-14 07:42:47 -04:00