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

StartUI: Fixed a bug that prevented the menu from displaying when not using rounded corners

pull/996/head
Valentin Radu 4 years ago
parent
db57642527
commit
8a5ff2f98b
1 changed files with 45 additions and 48 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. 93
      ExplorerPatcher/lvt.c

93
ExplorerPatcher/lvt.c
Unescape View File

@ -159,65 +159,62 @@ void LVT_StartUI_EnableRoundedCorners(HWND hWnd, DWORD dwReceipe, DWORD dwPos, H
{ {
int location = LVT_LOC_NONE; int location = LVT_LOC_NONE;
if (dwReceipe) Windows_UI_Xaml_Thickness drc;
drc.Left = 0.0; drc.Right = 0.0; drc.Top = 0.0; drc.Bottom = 0.0;
Windows_UI_Xaml_IUIElement* pIUIElement = NULL;
Windows_UI_Xaml_IFrameworkElement* pFrameworkElement = NULL;
pStartSizingFrame->lpVtbl->QueryInterface(pStartSizingFrame, &IID_Windows_UI_Xaml_IUIElement, &pIUIElement);
if (pIUIElement)
{ {
Windows_UI_Xaml_Thickness drc; pCanvasStatics->lpVtbl->GetLeft(pCanvasStatics, pIUIElement, &(drc.Left));
drc.Left = 0.0; drc.Right = 0.0; drc.Top = 0.0; drc.Bottom = 0.0; pCanvasStatics->lpVtbl->GetTop(pCanvasStatics, pIUIElement, &(drc.Top));
Windows_UI_Xaml_IUIElement* pIUIElement = NULL; }
Windows_UI_Xaml_IFrameworkElement* pFrameworkElement = NULL; pStartSizingFrame->lpVtbl->QueryInterface(pStartSizingFrame, &IID_Windows_UI_Xaml_IFrameworkElement, &pFrameworkElement);
pStartSizingFrame->lpVtbl->QueryInterface(pStartSizingFrame, &IID_Windows_UI_Xaml_IUIElement, &pIUIElement); if (pFrameworkElement)
if (pIUIElement) {
{ pFrameworkElement->lpVtbl->get_ActualWidth(pFrameworkElement, &(drc.Right));
pCanvasStatics->lpVtbl->GetLeft(pCanvasStatics, pIUIElement, &(drc.Left)); pFrameworkElement->lpVtbl->get_ActualHeight(pFrameworkElement, &(drc.Bottom));
pCanvasStatics->lpVtbl->GetTop(pCanvasStatics, pIUIElement, &(drc.Top)); }
} UINT dpi = GetDpiForWindow(hWnd);
pStartSizingFrame->lpVtbl->QueryInterface(pStartSizingFrame, &IID_Windows_UI_Xaml_IFrameworkElement, &pFrameworkElement); RECT rc;
if (pFrameworkElement) SetRect(&rc, drc.Left, drc.Top, drc.Right, drc.Bottom);
{ SetRect(&rc, MulDiv(rc.left, dpi, 96), MulDiv(rc.top, dpi, 96), MulDiv(rc.right, dpi, 96), MulDiv(rc.bottom, dpi, 96));
pFrameworkElement->lpVtbl->get_ActualWidth(pFrameworkElement, &(drc.Right)); *rect = rc;
pFrameworkElement->lpVtbl->get_ActualHeight(pFrameworkElement, &(drc.Bottom)); HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY);
} MONITORINFO mi;
UINT dpi = GetDpiForWindow(hWnd); ZeroMemory(&mi, sizeof(MONITORINFO));
RECT rc; mi.cbSize = sizeof(MONITORINFO);
SetRect(&rc, drc.Left, drc.Top, drc.Right, drc.Bottom); GetMonitorInfoW(hMonitor, &mi);
SetRect(&rc, MulDiv(rc.left, dpi, 96), MulDiv(rc.top, dpi, 96), MulDiv(rc.right, dpi, 96), MulDiv(rc.bottom, dpi, 96)); //swprintf(wszDebug, MAX_PATH, L"RECT %d %d %d %d - %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom, 0, 0, mi.rcWork.right - mi.rcWork.left, mi.rcWork.bottom - mi.rcWork.top);
*rect = rc; //OutputDebugStringW(wszDebug);
HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY); if (!(rc.left == 0 && rc.top == 0 && abs(mi.rcWork.right - mi.rcWork.left - rc.right) < 5 && abs(mi.rcWork.bottom - mi.rcWork.top - rc.bottom) < 5))
MONITORINFO mi; {
ZeroMemory(&mi, sizeof(MONITORINFO)); if (rc.left == 0)
mi.cbSize = sizeof(MONITORINFO);
GetMonitorInfoW(hMonitor, &mi);
//swprintf(wszDebug, MAX_PATH, L"RECT %d %d %d %d - %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom, 0, 0, mi.rcWork.right - mi.rcWork.left, mi.rcWork.bottom - mi.rcWork.top);
//OutputDebugStringW(wszDebug);
if (!(rc.left == 0 && rc.top == 0 && abs(mi.rcWork.right - mi.rcWork.left - rc.right) < 5 && abs(mi.rcWork.bottom - mi.rcWork.top - rc.bottom) < 5))
{ {
if (rc.left == 0) if (rc.top == 0)
{ {
if (rc.top == 0) location = LVT_LOC_TOPLEFT;
{
location = LVT_LOC_TOPLEFT;
}
else
{
location = LVT_LOC_BOTTOMLEFT;
}
} }
else else
{ {
location = LVT_LOC_TOPRIGHT; location = LVT_LOC_BOTTOMLEFT;
} }
} }
//swprintf_s(wszDebug, MAX_PATH, L"Location: %d\n", location); else
//OutputDebugStringW(wszDebug);
if (pFrameworkElement)
{
pFrameworkElement->lpVtbl->Release(pFrameworkElement);
}
if (pIUIElement)
{ {
pIUIElement->lpVtbl->Release(pIUIElement); location = LVT_LOC_TOPRIGHT;
} }
} }
//swprintf_s(wszDebug, MAX_PATH, L"Location: %d\n", location);
//OutputDebugStringW(wszDebug);
if (pFrameworkElement)
{
pFrameworkElement->lpVtbl->Release(pFrameworkElement);
}
if (pIUIElement)
{
pIUIElement->lpVtbl->Release(pIUIElement);
}
Windows_UI_Xaml_IDependencyObject* pStartSizingFramePanel = LVT_FindChildByClassName(pStartSizingFrame, pVisualTreeHelperStatics, L"StartUI.StartSizingFramePanel", NULL); Windows_UI_Xaml_IDependencyObject* pStartSizingFramePanel = LVT_FindChildByClassName(pStartSizingFrame, pVisualTreeHelperStatics, L"StartUI.StartSizingFramePanel", NULL);
if (pStartSizingFramePanel) if (pStartSizingFramePanel)
{ {

Write Preview
Loading…
Cancel
Save