|
|
|
|
@ -265,7 +265,7 @@ HRESULT STDMETHODCALLTYPE _ep_weather_ReboundBrowser(EPWeather* _this, LONG64 dw
@@ -265,7 +265,7 @@ HRESULT STDMETHODCALLTYPE _ep_weather_ReboundBrowser(EPWeather* _this, LONG64 dw
|
|
|
|
|
DWORD dwTextScaleFactor = epw_Weather_GetTextScaleFactor(_this); |
|
|
|
|
bounds.left = 0 - MulDiv(MulDiv(167, dpi, 96), dwTextScaleFactor, 100); |
|
|
|
|
bounds.top = 0 - MulDiv(MulDiv(178, dpi, 96), dwTextScaleFactor, 100); |
|
|
|
|
bounds.right = MulDiv(MulDiv(1333, dpi, 96), dwTextScaleFactor, 100);// 5560;
|
|
|
|
|
bounds.right = MulDiv(MulDiv((!InterlockedAdd64(&_this->dwTextDir, 0) ? 1333 : 705), dpi, 96), dwTextScaleFactor, 100);// 5560;
|
|
|
|
|
bounds.bottom = MulDiv(MulDiv(600, dpi, 96), dwTextScaleFactor, 100);// 15600;
|
|
|
|
|
} |
|
|
|
|
if (_this->pCoreWebView2Controller) |
|
|
|
|
@ -427,9 +427,15 @@ HRESULT STDMETHODCALLTYPE ICoreWebView2_ExecuteScriptCompleted(ICoreWebView2Exec
@@ -427,9 +427,15 @@ HRESULT STDMETHODCALLTYPE ICoreWebView2_ExecuteScriptCompleted(ICoreWebView2Exec
|
|
|
|
|
|
|
|
|
|
epw_Weather_LockData(_this); |
|
|
|
|
|
|
|
|
|
WCHAR* wszHeight = pResultObjectAsJson + 1; |
|
|
|
|
WCHAR* wszTextDir = pResultObjectAsJson + 1; |
|
|
|
|
if (wszTextDir) |
|
|
|
|
{ |
|
|
|
|
WCHAR* wszHeight = wcschr(wszTextDir, L'#'); |
|
|
|
|
if (wszHeight) |
|
|
|
|
{ |
|
|
|
|
wszHeight[0] = 0; |
|
|
|
|
wszHeight++; |
|
|
|
|
InterlockedExchange64(&_this->dwTextDir, wcsstr(wszTextDir, L"rtl")); |
|
|
|
|
WCHAR* wszTemperature = wcschr(wszHeight, L'#'); |
|
|
|
|
if (wszTemperature) |
|
|
|
|
{ |
|
|
|
|
@ -531,6 +537,7 @@ HRESULT STDMETHODCALLTYPE ICoreWebView2_ExecuteScriptCompleted(ICoreWebView2Exec
@@ -531,6 +537,7 @@ HRESULT STDMETHODCALLTYPE ICoreWebView2_ExecuteScriptCompleted(ICoreWebView2Exec
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
epw_Weather_UnlockData(_this); |
|
|
|
|
} |
|
|
|
|
|