chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Additional change for r897.

Browse Source
This commit is contained in:
spx 2011-08-13 10:03:16 +00:00
parent 04ebdd5186
commit fab4bdb088
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Rainmeter.cpp
View File

@ -3540,7 +3540,7 @@ void CRainmeter::RefreshAll()
GetMeterWindowsByLoadOrder(windows);
// Prepare the helper window
CSystem::PrepareHelperWindow(CSystem::GetWorkerW());
CSystem::PrepareHelperWindow();
// Refresh all
std::multimap<int, CMeterWindow*>::const_iterator iter = windows.begin();

50
Library/System.cpp
View File

@ -561,44 +561,68 @@ HWND CSystem::GetDefaultShellWindow()
else
{
WCHAR className[16];
if (GetClassName(ShellW, className, 16) > 0 &&
wcscmp(className, L"Progman") == 0)
if (!(GetClassName(ShellW, className, 16) > 0 &&
wcscmp(className, L"Progman") == 0))
{
c_ShellW = ShellW;
return ShellW;
ShellW = NULL;
}
}
}
c_ShellW = NULL;
return NULL;
c_ShellW = ShellW;
return ShellW;
}
/*
** GetWorkerW
**
** Finds the WorkerW window.
** If the window is not found, returns NULL.
** If the WorkerW window is not active, returns NULL.
**
*/
HWND CSystem::GetWorkerW()
{
static HWND c_DefView = NULL; // cache
HWND ShellW = GetDefaultShellWindow();
if (!ShellW) return NULL; // Default Shell (Explorer) not running
if (FindWindowEx(ShellW, NULL, L"SHELLDLL_DefView", L"") == NULL)
if (c_DefView && IsWindow(c_DefView))
{
HWND WorkerW = NULL;
while (WorkerW = FindWindowEx(NULL, WorkerW, L"WorkerW", L""))
HWND parent = GetAncestor(c_DefView, GA_PARENT);
if (parent)
{
if (BelongToSameProcess(ShellW, WorkerW) && FindWindowEx(WorkerW, NULL, L"SHELLDLL_DefView", L""))
if (parent == ShellW)
{
return WorkerW;
return NULL;
}
else
{
WCHAR className[16];
if (GetClassName(parent, className, 16) > 0 &&
wcscmp(className, L"WorkerW") == 0)
{
return parent;
}
}
}
}
return NULL;
HWND WorkerW = NULL, DefView = FindWindowEx(ShellW, NULL, L"SHELLDLL_DefView", L"");
if (DefView == NULL)
{
while (WorkerW = FindWindowEx(NULL, WorkerW, L"WorkerW", L""))
{
if (IsWindowVisible(WorkerW) &&
BelongToSameProcess(ShellW, WorkerW) &&
(DefView = FindWindowEx(WorkerW, NULL, L"SHELLDLL_DefView", L"")))
{
break;
}
}
}
c_DefView = DefView;
return WorkerW;
}
/*

5
Library/System.h
View File

@ -66,10 +66,8 @@ public:
static bool GetShowDesktop() { return c_ShowDesktop; }
static HWND GetWorkerW();
static HWND GetHelperWindow() { return c_HelperWindow; }
static void PrepareHelperWindow(HWND WorkerW);
static void PrepareHelperWindow(HWND WorkerW = GetWorkerW());
static OSPLATFORM GetOSPlatform();
static ULONGLONG GetTickCount64();
@ -93,6 +91,7 @@ private:
static void UpdateWorkareaInfo();
static HWND GetDefaultShellWindow();
static HWND GetWorkerW();
static void ChangeZPosInOrder();
static bool CheckDesktopState(HWND WorkerW);