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

Code cleanups.

Browse Source
This commit is contained in:
spx 2010-11-22 19:52:10 +00:00
parent 45e33ce704
commit d302aa675a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/MeterString.cpp
View File

@ -195,9 +195,9 @@ void CMeterString::Initialize()
} }
// Adjust the font size with screen DPI // Adjust the font size with screen DPI
HDC dc = GetDC(GetDesktopWindow()); HDC dc = GetDC(0);
int dpi = GetDeviceCaps(dc, LOGPIXELSX); int dpi = GetDeviceCaps(dc, LOGPIXELSX);
ReleaseDC(GetDesktopWindow(), dc); ReleaseDC(0, dc);
REAL size = (REAL)m_FontSize * (96.0f / (REAL)dpi); REAL size = (REAL)m_FontSize * (96.0f / (REAL)dpi);

12
Library/MeterWindow.cpp
View File

@ -1705,9 +1705,9 @@ bool CMeterWindow::ReadSkin()
if (_waccess(iniFile.c_str(), 0) == -1) if (_waccess(iniFile.c_str(), 0) == -1)
{ {
std::wstring message = L"Unable to refresh skin \""; std::wstring message = L"Unable to refresh skin \"";
message += m_SkinName.c_str(); message += m_SkinName;
message += L"\\"; message += L"\\";
message += m_SkinIniFile.c_str(); message += m_SkinIniFile;
message += L"\": Ini-file not found."; message += L"\": Ini-file not found.";
LSLog(LOG_DEBUG, APPNAME, message.c_str()); LSLog(LOG_DEBUG, APPNAME, message.c_str());
MessageBox(m_Window, message.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION); MessageBox(m_Window, message.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
@ -2295,14 +2295,14 @@ bool CMeterWindow::ResizeWindow(bool reset)
*/ */
Bitmap* CMeterWindow::GrabDesktop(int x, int y, int w, int h) Bitmap* CMeterWindow::GrabDesktop(int x, int y, int w, int h)
{ {
HDC desktopDC = GetDC(GetDesktopWindow()); HDC desktopDC = GetDC(0);
HDC dc = CreateCompatibleDC(desktopDC); HDC dc = CreateCompatibleDC(desktopDC);
HBITMAP desktopBM = CreateCompatibleBitmap(desktopDC, w, h); HBITMAP desktopBM = CreateCompatibleBitmap(desktopDC, w, h);
HBITMAP oldBM = (HBITMAP)SelectObject(dc, desktopBM); HBITMAP oldBM = (HBITMAP)SelectObject(dc, desktopBM);
BitBlt(dc, 0, 0, w, h, desktopDC, x, y, SRCCOPY); BitBlt(dc, 0, 0, w, h, desktopDC, x, y, SRCCOPY);
SelectObject(dc, oldBM); SelectObject(dc, oldBM);
DeleteDC(dc); DeleteDC(dc);
ReleaseDC(GetDesktopWindow(), desktopDC); ReleaseDC(0, desktopDC);
Bitmap* background = new Bitmap(desktopBM, NULL); Bitmap* background = new Bitmap(desktopBM, NULL);
DeleteObject(desktopBM); DeleteObject(desktopBM);
return background; return background;
@ -2551,14 +2551,14 @@ void CMeterWindow::UpdateTransparency(int alpha, bool reset)
szWindow.cy = m_WindowH; szWindow.cy = m_WindowH;
} }
HDC dcScreen = GetDC(GetDesktopWindow()); HDC dcScreen = GetDC(0);
HDC dcMemory = CreateCompatibleDC(dcScreen); HDC dcMemory = CreateCompatibleDC(dcScreen);
HBITMAP dbBitmap; HBITMAP dbBitmap;
m_DoubleBuffer->GetHBITMAP(Color(0, 0, 0, 0), &dbBitmap); m_DoubleBuffer->GetHBITMAP(Color(0, 0, 0, 0), &dbBitmap);
HBITMAP oldBitmap = (HBITMAP)SelectObject(dcMemory, dbBitmap); HBITMAP oldBitmap = (HBITMAP)SelectObject(dcMemory, dbBitmap);
UpdateLayeredWindow(m_Window, dcScreen, &ptWindowScreenPosition, &szWindow, dcMemory, &ptSrc, 0, &blendPixelFunction, ULW_ALPHA); UpdateLayeredWindow(m_Window, dcScreen, &ptWindowScreenPosition, &szWindow, dcMemory, &ptSrc, 0, &blendPixelFunction, ULW_ALPHA);
ReleaseDC(GetDesktopWindow(), dcScreen); ReleaseDC(0, dcScreen);
SelectObject(dcMemory, oldBitmap); SelectObject(dcMemory, oldBitmap);
DeleteDC(dcMemory); DeleteDC(dcMemory);
DeleteObject(dbBitmap); DeleteObject(dbBitmap);

6
Library/MeterWindow.h
View File

@ -359,9 +359,9 @@ private:
std::list<CMeasure*> m_Measures; // All the measures std::list<CMeasure*> m_Measures; // All the measures
std::list<CMeter*> m_Meters; // All the meters std::list<CMeter*> m_Meters; // All the meters
std::wstring m_SkinPath; // Path of the skin folder const std::wstring m_SkinPath; // Path of the skin folder
std::wstring m_SkinName; // Name of the current skin folder const std::wstring m_SkinName; // Name of the current skin folder
std::wstring m_SkinIniFile; // Name of the current skin iniFile const std::wstring m_SkinIniFile; // Name of the current skin iniFile
int m_UpdateCounter; int m_UpdateCounter;