Commit Graph

726 Commits

Author SHA1 Message Date
Saul Abreu
1f8aa5c495 Fixed text test that was incorrectly comparing the number of code units in a string of one type to the number of code points in another type.
[CL 2251957 by Saul Abreu in Main branch]
2014-08-11 17:26:46 -04:00
Dmitry Rekman
e9f8e5798a Linux window changes from PR #306.
[CL 2251775 by Dmitry Rekman in Main branch]
2014-08-11 15:30:21 -04:00
Dmitry Rekman
7f64a07c45 Removing errorneous check that broke iOS.
#codereview Peter.Sauerbrei

[CL 2251601 by Dmitry Rekman in Main branch]
2014-08-11 14:57:11 -04:00
Jamie Dale
9a1de2b5fe Fixed a crash when an IME was active when the editor was started
TTP# 340272 - IME crash when typing Korean in the Description TextBlock of SSourceControlSubmitWidget

- FWindowsTextInputMethodSystem::Initialize now checks if an IME is active when it's called, and will update the active IME state appropriately.
- Changed TSF to use AssociateFocus rather than SetFocus to fix some issues where the IME would become active incorrectly when the window focus was changed.
- Some belt-and-braces fixes for the IMM based code path (which was what was showing the crash, even though a TSF based IME was active).

#codereview Saul.Abreu, Max.Preussner

[CL 2251530 by Jamie Dale in Main branch]
2014-08-11 12:45:31 -04:00
Mark Satterthwaite
8c57a3d6c4 Expose the default GPU name on OS X.
#codereview michael.trepka

[CL 2251347 by Mark Satterthwaite in Main branch]
2014-08-11 09:30:13 -04:00
Gil Gribb
e4aac4a622 UE4 - fix lifo task graph behavior. Fix permanent stats "single stepping" when no stats are enabled, prevent draw events from being emitted when parallel rendering
[CL 2251287 by Gil Gribb in Main branch]
2014-08-11 08:19:59 -04:00
Mark Satterthwaite
4a4bb98c22 As a temporary band-aid for command-key suppressing keyup events on Mac OS X, intercept them and handle them directly.
#codereview michael.trepka

[CL 2251213 by Mark Satterthwaite in Main branch]
2014-08-11 05:54:18 -04:00
Dmitry Rekman
7fb45d090a Support more output devices on Linux.
- Partially based on PR #306 submission, corrected for cross-compiling.
- Each platform is now able to set up output devices for logging according to its own needs.

#codereview Josh.Adams, Michael.Trepka

[CL 2249193 by Dmitry Rekman in Main branch]
2014-08-08 21:42:14 -04:00
Rolando Caloca
eb6b518911 UE4 - Integrate from FNM
[CL 2248878 by Rolando Caloca in Main branch]
2014-08-08 16:16:23 -04:00
Justin Sargent
0c9c68e314 Added an IsEmptyOrWhitespace function to FText
[CL 2248742 by Justin Sargent in Main branch]
2014-08-08 14:44:33 -04:00
Jamie Dale
134b4be302 Added a CamelCase break iterator for use by the text layout
TTP#322500 - UX: Add wrapping of Asset Names based on CamelCase and Underscores, not just spaces

- Refactored the existing break iterators to share the same interface so that they could be swapped out at runtime.
- Made the iterators recyclable (so you can change the string rather than have to allocate a new iterator).
- Removed the public interfaces for the different break iterator types - they're all now accessed via IBreakIterator and are created via the relevant function in FBreakIterator.
- Removed a load of duplication in the ICU break iterators.
- Made FTextLayout accept a custom line break iterator (as used by its wrapping cache).
- Fixed a crash where the legacy line or word break iterators could underflow/overflow the string range.

ReviewedBy Justin.Sargent

[CL 2248547 by Jamie Dale in Main branch]
2014-08-08 11:23:20 -04:00
Steve Robb
31daaa978f Fix for TMap/TSet move semantics.
Allocator traits for FDefaultBitArrayAllocator fixed, which properly enables TSparseArray, TSet, TMap etc. move semantics.
Other missing allocator traits added.
TPair made move-aware.

#codereview robert.manuszewski

[CL 2248406 by Steve Robb in Main branch]
2014-08-08 09:07:47 -04:00
Zak Middleton
c1b300de77 #ue4 - FRandomStream.GetUnitVector() generates new sample if vector length is very small (improving precision and avoiding potential NaN).
[CL 2247803 by Zak Middleton in Main branch]
2014-08-07 19:39:50 -04:00
Josh Markiewicz
c18a424666 Weekly Fort Dev -> Main integration from UE4-Fortnite-CL-2245134
MCP
 "app" : "fortnite",
  "moduleName" : "Fortnite-PublicService",
  "branch" : "TRUNK",
  "build" : "306",
  "cln" : "2245028",
  "version" : "UNKNOWN"

[CL 2247600 by Josh Markiewicz in Main branch]
2014-08-07 17:34:29 -04:00
Matt Kuhlenschmidt
2927051971 Fixed crash importing a static mesh with no triangles and then opening the mesh in the static mesh editor
[CL 2247575 by Matt Kuhlenschmidt in Main branch]
2014-08-07 17:19:22 -04:00
Michael Trepka
16e920d175 Fixed a problem with certain windows (for example Add Code) treated as panels (floating window level, hide on deactivate) on Mac (TTP #343432)
[CL 2247510 by Michael Trepka in Main branch]
2014-08-07 16:54:14 -04:00
Ankit Khare
3011aa6448 #UE4 #HTML5 Fix up Win32 Simulator Build for HTML5.
[CL 2247484 by Ankit Khare in Main branch]
2014-08-07 16:34:10 -04:00
Justin Sargent
7a0823a4b2 Added the option to specify a currency code when formatting a number as currency.
[CL 2247444 by Justin Sargent in Main branch]
2014-08-07 15:59:02 -04:00
Michael Trepka
c776bff2c1 Disabled TBB malloc on mac again. Apparently it's still causing issues.
[CL 2247442 by Michael Trepka in Main branch]
2014-08-07 15:53:58 -04:00
Leigh Swift
f231b739ea Giving the http request class an accessor for the response class
#codereview Sam.Zamani

[CL 2247147 by Leigh Swift in Main branch]
2014-08-07 12:58:43 -04:00
Saul Abreu
e51d462fa7 Fixed negative currency formatting pattern in legacy culture number formatting.
[CL 2247126 by Saul Abreu in Main branch]
2014-08-07 12:58:31 -04:00
Jamie Dale
dbc7090d00 Added support for SMultiLineEditableText to edit rich-text
TTP# 336464 - Editor: Finish the Multiline Editable Text Block

Abstracted away the SetEditableText and GetEditableText functions from SMultiLineEditableText into "text marshallers" which handle converting text to and from a TextLayout.

There are three types of text marshallers currently implemented:
 * Plain-text
 * Rich-text
 * Syntax highlighting

Text marshallers also have the ability to inject formatting "live" (as the text changes), which is how the syntax highlighting marshaller works.

Added the ability for a run to query the information it was created with. This allows the rich-text marshaller to reconstruct the original rich-text from the styled runs.

To test this out, I've implemented a simple WYSIWYG rich-text editor demo with the following features:
 * Two SMultiLineEditableText widgets showing the same source text, one using a rich-text marshaller, and one using a syntax highlighter marshaller.
 * A toolbar to allow you to control the style of the selected text.
 * A button to allow you to insert a hyperlink into the document.

The demo also makes use of the meta-data stored in the runs (the same information used to reconstruct the original rich-text) to read the text style of whatever is currently under the cursor, live, as the cursor is moved.

Miscellaneous fixes:
 * Fixed an issue where deleting text that spanned multiple runs could leave the remaining runs in a bad state, leading to phantom text appearing (see FTextLayout::RemoveAt).
 * Fixed an issue where new-lines at the end of a rich-text document would be lost (see CalculateLineRanges).
 * Fixed an issue where \\r\\n line endings werenÆt being handled correctly by the rich-text parser (see CalculateLineRanges).
 * Fixed an issue where the rich-text parser would treat an empty run as plain-text (see FRichTextMarkupProcessing::ParseLineRanges).
 * Fixed an issue where inserting a line break when the cursor was at the end of a line containing multiple runs could sometimes fail (see FTextLayout::SplitLineAt).
 * Fixed mouse cursor movement not working correctly with a FSlateHyperlinkRun (see FSlateHyperlinkRun::GetTextIndexAt).

ReviewedBy Justin.Sargent

[CL 2246838 by Jamie Dale in Main branch]
2014-08-07 06:46:11 -04:00
Dmitriy Dyomin
155ec0e778 Changed world origin to a 3d location instead of 2d. Exposed Get/Set OriginLocation functions to blueprints.
[CL 2246744 by Dmitriy Dyomin in Main branch]
2014-08-07 05:00:43 -04:00
Michael Trepka
97923ec0dc Made regular modal windows on Mac use NSNormalWindowLevel (to fix issues with tooltips) and not disappear when the app is in background.
#codereview Mark.Satterthwaite

[CL 2246191 by Michael Trepka in Main branch]
2014-08-06 17:58:08 -04:00
Daniel Broder
9f50173ccf Merging using UE4-Fortnite-To-UE4 from CL 2236347
Unshelved this merge from Stephan and then completed the merge with additional fixes and testing.

Hand fixed some WorldExp compile issues due to changes to OnPaint() signature.

#Integration

[CL 2245992 by Daniel Broder in Main branch]
2014-08-06 16:12:41 -04:00