Froz
/
ExplorerPatcher
mirror of https://github.com/valinet/ExplorerPatcher.git
1
0
Fork 0
Code Issues Projects Releases 1 Wiki Activity
Browse Source

Weather: Fixed display issues in RTL layouts (#954)

pull/979/head
Valentin Radu 4 years ago
parent
f9680fca0d
commit
38650ccab8
3 changed files with 94 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 177
      ep_weather_host/ep_weather_host.c
  2. 1
      ep_weather_host/ep_weather_host.h
  3. 1
      ep_weather_host/ep_weather_provider_google_script.h

177
ep_weather_host/ep_weather_host.c
Unescape View File

@ -265,7 +265,7 @@ HRESULT STDMETHODCALLTYPE _ep_weather_ReboundBrowser(EPWeather* _this, LONG64 dw
DWORD dwTextScaleFactor = epw_Weather_GetTextScaleFactor(_this); DWORD dwTextScaleFactor = epw_Weather_GetTextScaleFactor(_this);
bounds.left = 0 - MulDiv(MulDiv(167, dpi, 96), dwTextScaleFactor, 100); bounds.left = 0 - MulDiv(MulDiv(167, dpi, 96), dwTextScaleFactor, 100);
bounds.top = 0 - MulDiv(MulDiv(178, 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; bounds.bottom = MulDiv(MulDiv(600, dpi, 96), dwTextScaleFactor, 100);// 15600;
} }
if (_this->pCoreWebView2Controller) if (_this->pCoreWebView2Controller)
@ -427,101 +427,108 @@ HRESULT STDMETHODCALLTYPE ICoreWebView2_ExecuteScriptCompleted(ICoreWebView2Exec
epw_Weather_LockData(_this); epw_Weather_LockData(_this);
WCHAR* wszHeight = pResultObjectAsJson + 1; WCHAR* wszTextDir = pResultObjectAsJson + 1;
if (wszHeight) if (wszTextDir)
{ {
WCHAR* wszTemperature = wcschr(wszHeight, L'#'); WCHAR* wszHeight = wcschr(wszTextDir, L'#');
if (wszTemperature) if (wszHeight)
{ {
wszTemperature[0] = 0; wszHeight[0] = 0;
wszTemperature++; wszHeight++;
WCHAR* wszUnit = wcschr(wszTemperature, L'#'); InterlockedExchange64(&_this->dwTextDir, wcsstr(wszTextDir, L"rtl"));
if (wszUnit) WCHAR* wszTemperature = wcschr(wszHeight, L'#');
if (wszTemperature)
{ {
wszUnit[0] = 0; wszTemperature[0] = 0;
wszUnit++; wszTemperature++;
WCHAR* wszCondition = wcschr(wszUnit, L'#'); WCHAR* wszUnit = wcschr(wszTemperature, L'#');
if (wszCondition) if (wszUnit)
{ {
wszCondition[0] = 0; wszUnit[0] = 0;
wszCondition++; wszUnit++;
WCHAR* wszLocation = wcschr(wszCondition, L'#'); WCHAR* wszCondition = wcschr(wszUnit, L'#');
if (wszLocation) if (wszCondition)
{ {
wszLocation[0] = 0; wszCondition[0] = 0;
wszLocation++; wszCondition++;
WCHAR* pImage = wcschr(wszLocation, L'#'); WCHAR* wszLocation = wcschr(wszCondition, L'#');
if (pImage) if (wszLocation)
{ {
pImage[0] = 0; wszLocation[0] = 0;
pImage++; wszLocation++;
WCHAR* pTerm = wcschr(pImage, L'"'); WCHAR* pImage = wcschr(wszLocation, L'#');
if (pTerm) if (pImage)
{ {
pTerm[0] = 0; pImage[0] = 0;
if (_this->wszTemperature) pImage++;
WCHAR* pTerm = wcschr(pImage, L'"');
if (pTerm)
{ {
free(_this->wszTemperature); pTerm[0] = 0;
} if (_this->wszTemperature)
if (_this->wszUnit)
{
free(_this->wszUnit);
}
if (_this->wszCondition)
{
free(_this->wszCondition);
}
if (_this->pImage)
{
free(_this->pImage);
}
if (_this->wszLocation)
{
free(_this->wszLocation);
}
_this->cbTemperature = (wcslen(wszTemperature) + 1) * sizeof(WCHAR);
_this->wszTemperature = malloc(_this->cbTemperature);
_this->cbUnit = (wcslen(wszUnit) + 1) * sizeof(WCHAR);
_this->wszUnit = malloc(_this->cbUnit);
_this->cbCondition = (wcslen(wszCondition) + 1) * sizeof(WCHAR);
_this->wszCondition = malloc(_this->cbCondition);
_this->cbImage = wcslen(pImage) / 2;
_this->pImage = malloc(_this->cbImage);
_this->cbLocation = (wcslen(wszLocation) + 1) * sizeof(WCHAR);
_this->wszLocation = malloc(_this->cbLocation);
if (_this->wszTemperature && _this->wszUnit && _this->wszCondition && _this->pImage && _this->wszLocation)
{
wcscpy_s(_this->wszTemperature, _this->cbTemperature / 2, wszTemperature);
wcscpy_s(_this->wszUnit, _this->cbUnit / 2, wszUnit);
wcscpy_s(_this->wszCondition, _this->cbCondition / 2, wszCondition);
wcscpy_s(_this->wszLocation, _this->cbLocation / 2, wszLocation);
for (unsigned int i = 0; i < _this->cbImage * 2; i = i + 2)
{ {
WCHAR tmp[3]; free(_this->wszTemperature);
tmp[0] = pImage[i];
tmp[1] = pImage[i + 1];
tmp[2] = 0;
_this->pImage[i / 2] = wcstol(tmp, NULL, 16);
} }
if (_this->wszUnit)
bOk = TRUE; {
} free(_this->wszUnit);
int h = _wtoi(wszHeight); }
int ch = MulDiv(h, EP_WEATHER_HEIGHT, 367); if (_this->wszCondition)
UINT dpi = GetDpiForWindow(_this->hWnd); {
ch = MulDiv(MulDiv(ch, dpi, 96), epw_Weather_GetTextScaleFactor(_this), 100); free(_this->wszCondition);
RECT rc; }
GetWindowRect(_this->hWnd, &rc); if (_this->pImage)
int w = MulDiv(MulDiv(EP_WEATHER_WIDTH, GetDpiForWindow(_this->hWnd), 96), epw_Weather_GetTextScaleFactor(_this), 100); {
if ((rc.bottom - rc.top != ch) || (rc.right - rc.left != w)) free(_this->pImage);
{ }
SetWindowPos(_this->hWnd, NULL, 0, 0, w, ch, SWP_NOMOVE | SWP_NOSENDCHANGING); if (_this->wszLocation)
_ep_weather_ReboundBrowser(_this, FALSE); {
HWND hNotifyWnd = InterlockedAdd64(&_this->hNotifyWnd, 0); free(_this->wszLocation);
if (hNotifyWnd) }
_this->cbTemperature = (wcslen(wszTemperature) + 1) * sizeof(WCHAR);
_this->wszTemperature = malloc(_this->cbTemperature);
_this->cbUnit = (wcslen(wszUnit) + 1) * sizeof(WCHAR);
_this->wszUnit = malloc(_this->cbUnit);
_this->cbCondition = (wcslen(wszCondition) + 1) * sizeof(WCHAR);
_this->wszCondition = malloc(_this->cbCondition);
_this->cbImage = wcslen(pImage) / 2;
_this->pImage = malloc(_this->cbImage);
_this->cbLocation = (wcslen(wszLocation) + 1) * sizeof(WCHAR);
_this->wszLocation = malloc(_this->cbLocation);
if (_this->wszTemperature && _this->wszUnit && _this->wszCondition && _this->pImage && _this->wszLocation)
{
wcscpy_s(_this->wszTemperature, _this->cbTemperature / 2, wszTemperature);
wcscpy_s(_this->wszUnit, _this->cbUnit / 2, wszUnit);
wcscpy_s(_this->wszCondition, _this->cbCondition / 2, wszCondition);
wcscpy_s(_this->wszLocation, _this->cbLocation / 2, wszLocation);
for (unsigned int i = 0; i < _this->cbImage * 2; i = i + 2)
{
WCHAR tmp[3];
tmp[0] = pImage[i];
tmp[1] = pImage[i + 1];
tmp[2] = 0;
_this->pImage[i / 2] = wcstol(tmp, NULL, 16);
}
bOk = TRUE;
}
int h = _wtoi(wszHeight);
int ch = MulDiv(h, EP_WEATHER_HEIGHT, 367);
UINT dpi = GetDpiForWindow(_this->hWnd);
ch = MulDiv(MulDiv(ch, dpi, 96), epw_Weather_GetTextScaleFactor(_this), 100);
RECT rc;
GetWindowRect(_this->hWnd, &rc);
int w = MulDiv(MulDiv(EP_WEATHER_WIDTH, GetDpiForWindow(_this->hWnd), 96), epw_Weather_GetTextScaleFactor(_this), 100);
if ((rc.bottom - rc.top != ch) || (rc.right - rc.left != w))
{ {
InvalidateRect(hNotifyWnd, NULL, TRUE); SetWindowPos(_this->hWnd, NULL, 0, 0, w, ch, SWP_NOMOVE | SWP_NOSENDCHANGING);
_ep_weather_ReboundBrowser(_this, FALSE);
HWND hNotifyWnd = InterlockedAdd64(&_this->hNotifyWnd, 0);
if (hNotifyWnd)
{
InvalidateRect(hNotifyWnd, NULL, TRUE);
}
} }
} }
} }

1
ep_weather_host/ep_weather_host.h
Unescape View File

@ -52,6 +52,7 @@ typedef interface EPWeather
LONG64 dwGeolocationMode; LONG64 dwGeolocationMode;
LONG64 dwWindowCornerPreference; LONG64 dwWindowCornerPreference;
LONG64 dwDevMode; LONG64 dwDevMode;
LONG64 dwTextDir;
HANDLE hMutexData; // protects the following: HANDLE hMutexData; // protects the following:
DWORD cbTemperature; DWORD cbTemperature;

1
ep_weather_host/ep_weather_provider_google_script.h
Unescape View File

@ -63,6 +63,7 @@ function ep_weather_getData(imageBitmap, ch) {\n\
}\n\ }\n\
}\n\ }\n\
let res = (\n\ let res = (\n\
document.documentElement.getAttribute(\"dir\") + \"#\" + \n\
document.getElementsByClassName(\"ULSxyf\")[0].offsetHeight + \"#\" + \n\ document.getElementsByClassName(\"ULSxyf\")[0].offsetHeight + \"#\" + \n\
document.getElementById(ch.includes('x') ? \"wob_ttm\" : \"wob_tm\").innerText + \"#\" + \n\ document.getElementById(ch.includes('x') ? \"wob_ttm\" : \"wob_tm\").innerText + \"#\" + \n\
Array.from(document.getElementsByClassName('wob-unit')[0].getElementsByTagName('span')).filter(e => e.className == 'wob_t').filter(e => !e.style.display.toString().includes(\"none\"))[0].innerText + \"#\" + \n\ Array.from(document.getElementsByClassName('wob-unit')[0].getElementsByTagName('span')).filter(e => e.className == 'wob_t').filter(e => !e.style.display.toString().includes(\"none\"))[0].innerText + \"#\" + \n\

Write Preview
Loading…
Cancel
Save