Commit Graph

23 Commits

Author SHA1 Message Date
Josh Adams
c522506e1a SlateViewer compiling for iOS (not running yet); had to make some ICU.Build.cs changes for Programs
#codereview saul.abreu,justin.sargent

[CL 2391153 by Josh Adams in Main branch]
2014-12-17 10:25:23 -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
Michael Trepka
e1ba23a275 Removed debug printf from SlateViewerMainMac.cpp
[CL 2377996 by Michael Trepka in Main branch]
2014-12-05 14:43:07 -05:00
Michael Trepka
cc71376314 CEF3 integration for Mac in SlateViewer. Still WIP - there's no keyboard support yet and horizontal scrolling with mouse wheel/gestures doesn't work.
#codereview Matthew.Griffin, Mark.Satterthwaite, Dmitry.Rekman

[CL 2367740 by Michael Trepka in Main branch]
2014-11-21 13:41:17 -05:00
Matthew Griffin
4764afd436 Moving SWebBrowser into the WebBrowser module to reduce the amount of modules/projects that will include it automatically.
To remove its use in AppFramework and keep using it in the SlateViewer app, I needed to define its tab in AppFramework and spawn it as a nomad tab in SlateViewer.

[CL 2358266 by Matthew Griffin in Main branch]
2014-11-13 04:46:55 -05:00
Nick Atamas
5984aebe9c Slate : Added -perftest option to SlateViewer. Added button in WidgetReflector that copies Slate Perf Stats to clipboard.
#codereview Wes.Hunt

[CL 2353749 by Nick Atamas in Main branch]
2014-11-07 18:01:32 -05:00
Nick Atamas
fe50b7005c Slate : Added stat visualization to the widget reflector. Slate can now be easily profiled in SlateViewer. Requires adding <bCompileWithStatsWithoutEngine>true</bCompileWithStatsWithoutEngine> to a local BuildConfiguration.xml.
[CL 2350283 by Nick Atamas in Main branch]
2014-11-05 13:13:07 -05:00
Matthew Griffin
d39dcfc4cf Changing Web Browser Singleton to tick itself
Removes depency on WebBrowser project from Slate, it now depends on Slate instead.
Removed functions from Singleton interface that are no longer needed.
Get the Slate renderer when needed instead of keeping reference.
Added call to FTicker::Tick function in Slate viewer app so that Web Browser will continue to work.

[CL 2330030 by Matthew Griffin in Main branch]
2014-10-15 08:32:12 -04:00
Michael Trepka
1d5a0d5506 Updated engine code to compile correctly with OS X 10.10 SDK, added SDK detection to MacToolChain (based on iOS one)
#codereview Mark.Satterthwaite

[CL 2325808 by Michael Trepka in Main branch]
2014-10-10 15:07:46 -04:00
Michael Trepka
c7760aa8a6 FSlateMacMenu::UpdateCachedState() now checks with the global tab manager if there's any active tab instead of depending on not being called when there's not. This should solve any remaining issues with executing it while the app is quitting.
[CL 2314311 by Michael Trepka in Main branch]
2014-09-30 11:38:23 -04:00
Mark Satterthwaite
e432c124c8 Rather than cancelling OS quit requests on OS X and then quitting behind Cocoa's back, use the proper deferral mechanism so that we have Cocoa wait for the separate game thread to exit before it tears the application down. UE4 applications shouldn't cancel shutdown, restart or logout requests anymore.
#codereview michael.trepka

[CL 2312939 by Mark Satterthwaite in Main branch]
2014-09-29 11:10:28 -04:00
Michael Trepka
310577c6d2 Refactored Mac menu code to work better with game thread and fix crashes caused by performing game thread calls in menuNeedsUpdate:
#codereview Mark.Satterthwaite

[CL 2310125 by Michael Trepka in Main branch]
2014-09-25 14:42:11 -04:00
Thomas Sarkanen
3522037b79 Source code access now works in SlateViewer and Launcher
Made sure to manually load the appropriate modules for source code access.
The hot reload dependency that VisualStudioSourceCodeAccess had was bringing in the whole editor as a dependency, so this is now restricted to editor builds.
SlateViewer now compiles in CoreUObject as the source code accessor module requires it for its settings.

TTP# 333675 - CHECKIN: SLATE: WidgetReflector code reference hyperlinks don't work anymore

#codereview Nick.Atamas,Frank.Fella

[CL 2292278 by Thomas Sarkanen in Main branch]
2014-09-10 06:43:48 -04:00
Max Preussner
f167dce37e Slate: Moved TestSuite and ColorPicker into new module AppFramework
The AppFramework module is intended to be used for compound widgets and UI related classes that are too specific (not basic enough) for Slate, but also not Editor specific (reusable in non-Editor applications and games). The test suite has been moved in its entirety for now, but core widget specific test classes will eventually be split off and moved back into Slate, so that they can live alongside of their corresponding widgets.

Other changes:
- moved to "include what you use" scheme for SColorPicker
- broke out color picker related widgets that may be reusable
- added forward declarations to reduce header include dependencies

#CodeReview: saul.abreu

[CL 2275496 by Max Preussner in Main branch]
2014-08-27 20:35:19 -04:00
Mark Satterthwaite
8f351ac383 On OS X detach the game thread from the 'blessed' Cocoa main thread.
Cocoa isn't an event-polling API as UE4 expects, so previously we were subverting the NSApplication's event handling to pretend that it was. When the engine wasn't running the event loop fast enough, such as when loading where it isn't processed at all, this resulted in unresponsive windows and Spinning-Beachball-Of-Death. That isn't very satisfactory & to some users appears as if the application has crashed. To address these deficiencies without further attempts to subvert Cocoa, the game is now punted onto a separate thread where it can run its own tight-loop, leaving the main thread to handle the Cocoa event run-loop. Events are captured by delegate objects, as Cocoa requires, but dispatched and handled on the game thread which makes Cocoa appear more like other platform APIs to the higher-level UE4 code.
This can all be disabled using the MAC_SEPARATE_GAME_THREAD define in CocoaThread.cpp.
#codereview michael.trepka

[CL 2262543 by Mark Satterthwaite in Main branch]
2014-08-19 10:46:30 -04:00
Max Preussner
259dd3c351 Programs: NULL to nullptr
[CL 2239480 by Max Preussner in Main branch]
2014-08-01 02:40:54 -04:00
Michael Trepka
ac834c4a36 Removed redundant setting of GUseCrashReportClient on Mac and some unused code from FMacPlatformMisc::SubmitErrorReport()
#codereview Mark.Satterthwaite

[CL 2223750 by Michael Trepka in Main branch]
2014-07-18 14:22:26 -04:00
Michael Trepka
e0b50589d2 Removed Mac MainMenu.xib, the app and window menus are now generated dynamically.
[CL 2088627 by Michael Trepka in Main branch]
2014-05-29 17:46:24 -04:00
Dmitry Rekman
1041c8a2df Set Ctrl-C handler in SlateViewer.
[CL 2070655 by Dmitry Rekman in Main branch]
2014-05-12 15:25:10 -04:00
Max Preussner
b63129a60c Slate: Refactored core Slate implementation into SlateCore module in preparation for UMG.
Other Updates:
- The WidgetReflector is now in its own module as well. It will be converted to a plug-in later.
- The Public API of both Slate and SlateCore has largely been reorganized for better discoverabilty. More cleanup work is needed.
- Added a lot of missing API documentation and fixed existing ones. More and better documentation is needed.
- Removed dead code, fixed a couple things I stubled upon, and conformed to coding guidelines (NULL vs nullptr, line breaks, etc.)

Upgrade Notes:
- The Slate Remote Server is currently disabled - will be re-enabled shortly!
- If your module previously had a module dependency to 'Slate', it now also needs a PrivateModuleDependency to 'SlateCore' in its Build.cs file.
- If your module exposes in any of its Public header files types that are now declared in SlateCore, it needs a PublicModuleDependency to 'SlateCore'
- The ToolTip property type on SWidget has changed from SToolTip to IToolTip; change local variables to TSharedPtr<IToolTip> instead of TSharedPtr<SToolTip> where needed
- IToolTip is not a widget. If you need access to the actual widget that represents the tool tip, use IToolTip::AsWidget(); If you need access to the tool tip's content, use IToolTip::GetContentWidget()

Troubleshooting:
- After syncing to this changelist you may have to clean your /Engine/Intermediate/Build/ directory and rebuild your entire project
- If in your project you are getting linker errors for unresolved types that are now declared in SlateCore, you may be missing a dependency to 'SlateCore'
- If in the Engine code you are getting linker errors for unresolved types that are now declared in SlateCore, you may need to rebuild the entire Engine

[CL 2057118 by Max Preussner in Main branch]
2014-04-26 15:07:24 -04:00
Michael Trepka
87999b56cb Fixed Mac non-unity build errors
[CL 2049921 by Michael Trepka in Main branch]
2014-04-23 19:35:31 -04:00
UnrealBot
db494a6e69 Engine source (Main branch up to CL 2037954) 2014-04-02 18:09:23 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00