Permalink
Browse files

Merge remote-tracking branch 'origin/master' into fast_lookup_fix

  • Loading branch information...
codenulls committed Dec 16, 2018
2 parents 04619ab + 7d15683 commit c9a8d3b1a0271f38a906d258c1d67e6ff5460ac6
Showing with 11 additions and 7 deletions.
  1. +9 −5 Client/cefweb/CWebView.cpp
  2. +1 −1 Client/cefweb/CWebView.h
  3. +1 −1 utils/buildactions/install_cef.lua
@@ -593,16 +593,20 @@ bool CWebView::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefProces
// http://magpcss.org/ceforum/apidocs3/projects/(default)/CefRenderHandler.html#GetViewRect(CefRefPtr%3CCefBrowser%3E,CefRect&) //
// //
////////////////////////////////////////////////////////////////////
bool CWebView::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect)
void CWebView::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect)
{
if (m_bBeingDestroyed)
return false;

rect.x = 0;
rect.y = 0;

if (m_bBeingDestroyed)
{
rect.width = 1;
rect.height = 1;
return;
}

rect.width = static_cast<int>(m_pWebBrowserRenderItem->m_uiSizeX);
rect.height = static_cast<int>(m_pWebBrowserRenderItem->m_uiSizeY);
return true;
}

////////////////////////////////////////////////////////////////////
@@ -114,7 +114,7 @@ class CWebView : public CWebViewInterface,
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefProcessId source_process, CefRefPtr<CefProcessMessage> message) override;

// CefRenderHandler methods
virtual bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
virtual void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect& rect) override;
virtual void OnPopupShow(CefRefPtr<CefBrowser> browser, bool show) override;
virtual void OnPopupSize(CefRefPtr<CefBrowser> browser, const CefRect& rect) override;
virtual void OnPaint(CefRefPtr<CefBrowser> browser, CefRenderHandler::PaintElementType paintType, const CefRenderHandler::RectList& dirtyRects,
@@ -7,7 +7,7 @@ local CEF_PATH = "vendor/cef3/"
local CEF_URL_PREFIX = "https://mirror.mtasa.com/bdata/cef/"
local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"

local CEF_VERSION = "3.3538.1852.gcb937fc" -- Change here to update CEF version
local CEF_VERSION = "3.3578.1860.g36610bd" -- Change here to update CEF version

function make_cef_download_url()
return CEF_URL_PREFIX..CEF_VERSION..CEF_URL_SUFFIX

0 comments on commit c9a8d3b

Please sign in to comment.