Fixed a problem that "Random" is case-sensitive in CALC measure.

Fixed a problem that a deletion of the meter window encounters enormous delays when the meter window has enormous Update=.

Some small cosmetics.
This commit is contained in:
spx
2010-04-08 23:16:43 +00:00
parent 54fe29a062
commit 32db892e2c
5 changed files with 42 additions and 24 deletions

View File

@ -29,13 +29,15 @@ enum TIMER
{
TIMER_SHOWDESKTOP = 1,
TIMER_COMPOSITION = 2,
TIMER_NETSTATS = 3
TIMER_NETSTATS = 3,
TIMER_DELETELATER = 4
};
enum INTERVAL
{
INTERVAL_SHOWDESKTOP = 250,
INTERVAL_COMPOSITION = 250,
INTERVAL_NETSTATS = 10000
INTERVAL_NETSTATS = 10000,
INTERVAL_DELETELATER = 1000
};
MULTIMONITOR_INFO CSystem::c_Monitors = { 0 };
@ -116,6 +118,7 @@ void CSystem::Initialize(HINSTANCE instance)
SetTimer(c_Window, TIMER_SHOWDESKTOP, INTERVAL_SHOWDESKTOP, NULL);
SetTimer(c_Window, TIMER_NETSTATS, INTERVAL_NETSTATS, NULL);
SetTimer(c_Window, TIMER_DELETELATER, INTERVAL_DELETELATER, NULL);
}
/*
@ -129,6 +132,7 @@ void CSystem::Finalize()
KillTimer(c_Window, TIMER_SHOWDESKTOP);
KillTimer(c_Window, TIMER_COMPOSITION);
KillTimer(c_Window, TIMER_NETSTATS);
KillTimer(c_Window, TIMER_DELETELATER);
if (c_WinEventHook) UnhookWinEvent(c_WinEventHook);
@ -896,9 +900,13 @@ LRESULT CALLBACK CSystem::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
// Statistics
CMeasureNet::UpdateStats();
Rainmeter->WriteStats(false);
if (Rainmeter) Rainmeter->WriteStats(false);
return 0;
case TIMER_DELETELATER:
if (Rainmeter) Rainmeter->ClearDeleteLaterList();
return 0;
}
break;