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

Changed: "Normal" z-position now stays on desktop by default

Browse Source
This commit is contained in:
Birunthan Mohanathas
2011-11-10 11:50:47 +00:00
parent 1e9d424c99
commit 8cb0a041e0
6 changed files with 136 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Library/MeterWindow.cpp
View File

@ -41,6 +41,8 @@ using namespace Gdiplus;
#define SNAPDISTANCE 10
#define ZPOS_FLAGS (SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOSENDCHANGING)
enum TIMER
{
TIMER_METER = 1,
@ -431,7 +433,11 @@ void CMeterWindow::Refresh(bool init, bool all)
ScreenToWindow();
if (all || oldZPos != m_WindowZPosition)
if (init)
{
ChangeSingleZPos(m_WindowZPosition, all);
}
else if (all || oldZPos != m_WindowZPosition)
{
ChangeZPos(m_WindowZPosition, all);
}
@ -590,8 +596,6 @@ void CMeterWindow::MoveWindow(int x, int y)
*/
void CMeterWindow::ChangeZPos(ZPOSITION zPos, bool all)
{
#define ZPOS_FLAGS (SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOSENDCHANGING)
HWND winPos = HWND_NOTOPMOST;
m_WindowZPosition = zPos;
@ -622,12 +626,11 @@ void CMeterWindow::ChangeZPos(ZPOSITION zPos, bool all)
}
break;
case ZPOSITION_NORMAL:
if (all || !Rainmeter->IsNormalStayDesktop()) break;
case ZPOSITION_ONDESKTOP:
if (CSystem::GetShowDesktop())
{
// Set WS_EX_TOPMOST flag
SetWindowPos(m_Window, HWND_TOPMOST, 0, 0, 0, 0, ZPOS_FLAGS);
winPos = CSystem::GetHelperWindow();
if (all)
@ -669,6 +672,30 @@ void CMeterWindow::ChangeZPos(ZPOSITION zPos, bool all)
SetWindowPos(m_Window, winPos, 0, 0, 0, 0, ZPOS_FLAGS);
}
/*
** ChangeSingleZPos
**
** Sets the window's z-position in proper order.
**
*/
void CMeterWindow::ChangeSingleZPos(ZPOSITION zPos, bool all)
{
if (zPos == ZPOSITION_NORMAL && m_Rainmeter->IsNormalStayDesktop() && (!all || CSystem::GetShowDesktop()))
{
m_WindowZPosition = zPos;
// Set window on top of all other ZPOSITION_ONDESKTOP, ZPOSITION_BOTTOM, and ZPOSITION_NORMAL windows
SetWindowPos(m_Window, CSystem::GetBackmostTopWindow(), 0, 0, 0, 0, ZPOS_FLAGS);
// Bring window on top of other application windows
BringWindowToTop(m_Window);
}
else
{
ChangeZPos(zPos, all);
}
}
/*
** RunBang
**
@ -3812,7 +3839,7 @@ void CMeterWindow::SetWindowHide(HIDEMODE hide)
*/
void CMeterWindow::SetWindowZPosition(ZPOSITION zpos)
{
ChangeZPos(zpos);
ChangeSingleZPos(zpos);
WriteConfig(SETTING_ALWAYSONTOP);
}
@ -3950,14 +3977,22 @@ LRESULT CMeterWindow::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam)
*/
LRESULT CMeterWindow::OnWindowPosChanging(UINT uMsg, WPARAM wParam, LPARAM lParam)
{
LPWINDOWPOS wp=(LPWINDOWPOS)lParam;
LPWINDOWPOS wp = (LPWINDOWPOS)lParam;
if (!m_Refreshing)
{
if (m_WindowZPosition == ZPOSITION_ONBOTTOM || m_WindowZPosition == ZPOSITION_ONDESKTOP)
if (m_WindowZPosition == ZPOSITION_NORMAL && m_Rainmeter->IsNormalStayDesktop() && CSystem::GetShowDesktop())
{
// do not change the z-order. This keeps the window on bottom.
wp->flags|=SWP_NOZORDER;
if (!(wp->flags & (SWP_NOOWNERZORDER | SWP_NOACTIVATE)))
{
// Set window on top of all other ZPOSITION_ONDESKTOP, ZPOSITION_BOTTOM, and ZPOSITION_NORMAL windows
wp->hwndInsertAfter = CSystem::GetBackmostTopWindow();
}
}
else if (m_WindowZPosition == ZPOSITION_ONDESKTOP || m_WindowZPosition == ZPOSITION_ONBOTTOM)
{
// Do not change the z-order. This keeps the window on bottom.
wp->flags |= SWP_NOZORDER;
}
}