From 6644b81909a4ce6194926c8e471113f2cb5b1034 Mon Sep 17 00:00:00 2001 From: spx Date: Mon, 31 Oct 2011 07:42:18 +0000 Subject: [PATCH] Code cleanup. --- Library/MeterImage.cpp | 9 +-- Library/MeterWindow.cpp | 169 ++++++++++++++-------------------------- Library/MeterWindow.h | 2 - 3 files changed, 63 insertions(+), 117 deletions(-) diff --git a/Library/MeterImage.cpp b/Library/MeterImage.cpp index c2c0f6a4..99244a50 100644 --- a/Library/MeterImage.cpp +++ b/Library/MeterImage.cpp @@ -258,14 +258,11 @@ bool CMeterImage::Draw(Graphics& graphics) int drawW = m_W; int drawH = m_H; - GUID guid; if (drawW == imageW && drawH == imageH && - m_ScaleMargins.left == 0 && m_ScaleMargins.top == 0 && m_ScaleMargins.right == 0 && m_ScaleMargins.bottom == 0 && - GetTransformationMatrix().IsIdentity() && - Ok == drawBitmap->GetRawFormat(&guid) && guid != ImageFormatMemoryBMP) + m_ScaleMargins.left == 0 && m_ScaleMargins.top == 0 && m_ScaleMargins.right == 0 && m_ScaleMargins.bottom == 0) { - CachedBitmap cache(drawBitmap, &graphics); - graphics.DrawCachedBitmap(&cache, x, y); + Rect r(x, y, drawW, drawH); + graphics.DrawImage(drawBitmap, r, 0, 0, imageW, imageH, UnitPixel); } else if (m_Tile) { diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 67360c77..2f2e2f35 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -71,7 +71,6 @@ CMeterWindow::CMeterWindow(const std::wstring& path, const std::wstring& config, m_Background(), m_BackgroundSize(), m_Window(), - m_ChildWindow(false), m_MouseOver(false), m_BackgroundMargins(), m_DragMargins(), @@ -108,7 +107,6 @@ CMeterWindow::CMeterWindow(const std::wstring& path, const std::wstring& config, m_NativeTransparency(true), m_AlphaValue(255), m_FadeDuration(250), -// m_MeasuresToVariables(false), m_WindowZPosition(ZPOSITION_NORMAL), m_DynamicWindowSize(false), m_ClickThrough(false), @@ -581,84 +579,81 @@ void CMeterWindow::ChangeZPos(ZPOSITION zPos, bool all) { #define ZPOS_FLAGS (SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOSENDCHANGING) - if (!m_ChildWindow) + HWND winPos = HWND_NOTOPMOST; + m_WindowZPosition = zPos; + + switch (zPos) { - HWND winPos = HWND_NOTOPMOST; - m_WindowZPosition = zPos; + case ZPOSITION_ONTOPMOST: + case ZPOSITION_ONTOP: + winPos = HWND_TOPMOST; + break; - switch (zPos) + case ZPOSITION_ONBOTTOM: + if (all) { - case ZPOSITION_ONTOPMOST: - case ZPOSITION_ONTOP: - winPos = HWND_TOPMOST; - break; + if (CSystem::GetShowDesktop()) + { + // Insert after the system window temporarily to keep order + winPos = CSystem::GetWindow(); + } + else + { + // Insert after the helper window + winPos = CSystem::GetHelperWindow(); + } + } + else + { + winPos = HWND_BOTTOM; + } + 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(); - case ZPOSITION_ONBOTTOM: if (all) { - if (CSystem::GetShowDesktop()) + // Insert after the helper window + } + else + { + // Find the "backmost" topmost window + while (winPos = ::GetNextWindow(winPos, GW_HWNDPREV)) { - // Insert after the system window temporarily to keep order - winPos = CSystem::GetWindow(); - } - else - { - // Insert after the helper window - winPos = CSystem::GetHelperWindow(); + if (GetWindowLong(winPos, GWL_EXSTYLE) & WS_EX_TOPMOST) + { + // Insert after the found window + if (0 != SetWindowPos(m_Window, winPos, 0, 0, 0, 0, ZPOS_FLAGS)) + { + break; + } + } } + return; + } + } + else + { + if (all) + { + // Insert after the helper window + winPos = CSystem::GetHelperWindow(); } else { winPos = HWND_BOTTOM; } - 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) - { - // Insert after the helper window - } - else - { - // Find the "backmost" topmost window - while (winPos = ::GetNextWindow(winPos, GW_HWNDPREV)) - { - if (GetWindowLong(winPos, GWL_EXSTYLE) & WS_EX_TOPMOST) - { - // Insert after the found window - if (0 != SetWindowPos(m_Window, winPos, 0, 0, 0, 0, ZPOS_FLAGS)) - { - break; - } - } - } - return; - } - } - else - { - if (all) - { - // Insert after the helper window - winPos = CSystem::GetHelperWindow(); - } - else - { - winPos = HWND_BOTTOM; - } - } - break; } - - SetWindowPos(m_Window, winPos, 0, 0, 0, 0, ZPOS_FLAGS); + break; } + + SetWindowPos(m_Window, winPos, 0, 0, 0, 0, ZPOS_FLAGS); } /* @@ -1867,7 +1862,6 @@ void CMeterWindow::ReadConfig() m_WindowStartHidden = false; m_SavePosition = true; m_SnapEdges = true; -// m_MeasuresToVariables = false; m_NativeTransparency = true; m_ClickThrough = false; m_KeepOnScreen = true; @@ -1917,7 +1911,6 @@ void CMeterWindow::ReadConfig() m_WindowStartHidden = 0!=parser.ReadInt(section, L"StartHidden", m_WindowStartHidden); m_SavePosition = 0!=parser.ReadInt(section, L"SavePosition", m_SavePosition); m_SnapEdges = 0!=parser.ReadInt(section, L"SnapEdges", m_SnapEdges); -// m_MeasuresToVariables = 0!=parser.ReadInt(section, L"MeasuresToVariables", m_MeasuresToVariables); m_NativeTransparency = 0!=parser.ReadInt(section, L"NativeTransparency", m_NativeTransparency); m_ClickThrough = 0!=parser.ReadInt(section, L"ClickThrough", m_ClickThrough); m_KeepOnScreen = 0!=parser.ReadInt(section, L"KeepOnScreen", m_KeepOnScreen); @@ -2966,23 +2959,6 @@ void CMeterWindow::Update(bool nodraw) // Post-updates PostUpdate(bActiveTransition); - -// if (m_MeasuresToVariables) // BUG: LSSetVariable doens't seem to work for some reason. -// { -// std::list::iterator i = m_Measures.begin(); -// for ( ; i != m_Measures.end(); i++) -// { -// const char* sz = (*i)->GetStringValue(AUTOSCALE_ON, 1, 1, false); -// if (sz && wcslen(sz) > 0) -// { -// WCHAR* wideSz = CMeter::ConvertToWide(sz); -// WCHAR* wideName = CMeter::ConvertToWide((*i)->GetName()); -// LSSetVariable(wideName, wideSz); -// delete [] wideSz; -// delete [] wideName; -// } -// } -// } } /* @@ -3060,17 +3036,6 @@ LRESULT CMeterWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam) { Update(false); CDialogAbout::UpdateMeasures(m_SkinName.c_str()); - - //if (m_KeepOnScreen) - //{ - // int x = m_ScreenX; - // int y = m_ScreenY; - // MapCoordsToScreen(x, y, m_WindowW, m_WindowH); - // if (x != m_ScreenX || y != m_ScreenY) - // { - // MoveWindow(x, y); - // } - //} } else if (wParam == TRANSITIONTIMER) { @@ -3172,20 +3137,6 @@ LRESULT CMeterWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam) } } -// // TEST -// if (!m_ChildWindow) -// { -// RECT rect; -// GetWindowRect(m_Window, &rect); -// if (rect.left != m_WindowX && rect.top != m_WindowY) -// { -// LogWithArgs(LOG_DEBUG, L"Window position has been changed. Moving it back to the place it belongs."); -// SetWindowPos(m_Window, NULL, m_WindowX, m_WindowY, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); -// } -// } - - // ~TEST - return 0; } diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h index d0177763..ed734f5a 100644 --- a/Library/MeterWindow.h +++ b/Library/MeterWindow.h @@ -356,7 +356,6 @@ private: SIZE m_BackgroundSize; HWND m_Window; // Handle to the Rainmeter window - bool m_ChildWindow; std::wstring m_RightMouseDownAction; // Action to run when right mouse is pressed std::wstring m_LeftMouseDownAction; // Action to run when left mouse is pressed @@ -413,7 +412,6 @@ private: bool m_NativeTransparency; // If true, use the W2k/XP native transparency int m_AlphaValue; // The 'from' transparency value 0 - 255 int m_FadeDuration; // Time it takes to fade the window -// bool m_MeasuresToVariables; // If true, Measured values are transformed to Litestep's eVars ZPOSITION m_WindowZPosition; // Window's Z-position bool m_DynamicWindowSize; // bool m_ClickThrough; //