Commit Graph

11 Commits

Author SHA1 Message Date
Matthew Griffin
315259b0d1 Fixed issues with merge of WebBrowser code from Launcher branch
#codereview Carlos.Cuello, Keli.Hlodversson

[CL 2510109 by Matthew Griffin in Main branch]
2015-04-13 06:16:41 -04:00
Marc Audy
4562acb429 Fix shadow variables
[CL 2507160 by Marc Audy in Main branch]
2015-04-09 15:23:52 -04:00
Carlos Cuello
65c6b1a695 [INTEGRATE] Merging using UE4-To-UE4-LauncherDev, integrate all up to cl 2496104 from the LauncherDev branch. updated friends and chat module, lib curl updates, portal related fixes
[CL 2499790 by Carlos Cuello in Main branch]
2015-04-02 09:42:37 -04:00
Carlos Cuello
6f1ac76399 [INTEGRATE] UE4-LauncherDev->UE4 integrate all up to cl 2475889
[CL 2478426 by Carlos Cuello in Main branch]
2015-03-13 08:26:18 -04:00
Matt Kuhlenschmidt
d5d02955c7 Fix race conditions when updating textures from an SWebBrowser. Introduced a new thread safe way to update a texture (this is expensive as it requires an extra memcopy).
#codereview matthew.griffin

[CL 2463566 by Matt Kuhlenschmidt in Main branch]
2015-02-26 22:49:18 -05:00
Max Preussner
7001904470 WebBrowser: Converted OnTitleChanged delegate to an event; code and documentation cleanup pass
Merging using UE4-To-UE4-LauncherDev, CL# 2441875

[CL 2445350 by Max Preussner in Main branch]
2015-02-13 15:52:26 -05:00
Matthew Griffin
721a43fc98 Added use of LoadString to Web Browser window
Also added the option to pass a content string when the window is created, as you need to wait a frame before the browser is passed back for it to be valid.

[CL 2412858 by Matthew Griffin in Main branch]
2015-01-20 16:49:52 -05:00
Matthew Griffin
6f5b21f0a1 Ensured that web browser window size is set correctly
Changed Web Browser Window Set Size function to take an int point as there's no need for float version

Calculated integer size of viewport by adding position and size before converting to int, which avoids problems with rounding.

[CL 2397445 by Matthew Griffin in Main branch]
2015-01-05 08:54:59 -05:00
Matthew Griffin
0cbd65612b Fixed issue with web browser not responding to keyboard input on Mac
Changed how keyboard codes are passed to CEF on Mac

[CL 2392320 by Matthew Griffin in Main branch]
2014-12-18 05:27:03 -05:00
Matthew Griffin
5215ae3298 Added functionality to change the current URL of a web browser window
[CL 2391070 by Matthew Griffin in Main branch]
2014-12-17 09:20:23 -05:00
Matthew Griffin
102bea4250 Moving WebBrowser and CEF3Utils to Runtime so that they can be used in games.
Also removed guards around browser code in SWebBrowser and made sure that path for sub process exe is correct if game exe is not in the same folder.

[CL 2389777 by Matthew Griffin in Main branch]
2014-12-16 06:41:01 -05:00