diff --git a/Application/Application.rc b/Application/Application.rc index 0e63f965..3e890f8a 100644 --- a/Application/Application.rc +++ b/Application/Application.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,470 - PRODUCTVERSION 1,3,0,470 + FILEVERSION 1,3,0,472 + PRODUCTVERSION 1,3,0,472 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BLOCK "040b04b0" BEGIN VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter" - VALUE "FileVersion", "1, 3, 0, 470" + VALUE "FileVersion", "1, 3, 0, 472" VALUE "InternalName", "Rainmeter" VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "Rainmeter.exe" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", "1, 3, 0, 470" + VALUE "ProductVersion", "1, 3, 0, 472" END END BLOCK "VarFileInfo" diff --git a/Library/Meter.cpp b/Library/Meter.cpp index 5cc427cf..2ba6021f 100644 --- a/Library/Meter.cpp +++ b/Library/Meter.cpp @@ -538,6 +538,7 @@ void CMeter::CreateToolTip(CMeterWindow* meterWindow) ti.rect = GetMeterRect(); SendMessage(hwndTT, TTM_ADDTOOL, NULL, (LPARAM) (LPTOOLINFO) &ti); + SendMessage(hwndTT, TTM_SETMAXTIPWIDTH, NULL, 1000); if (!m_ToolTipTitle.empty()) { @@ -573,6 +574,10 @@ void CMeter::CreateToolTip(CMeterWindow* meterWindow) SendMessage(hwndTT, TTM_SETTITLE, (WPARAM) hIcon, (LPARAM) m_ToolTipTitle.c_str()); DestroyIcon(hIcon); } + if (IsHidden()) + { + SendMessage(hwndTT, TTM_ACTIVATE, FALSE, NULL); + } m_ToolTipHandle = hwndTT; } diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 602ab08c..62871dcd 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -502,6 +502,7 @@ void CMeterWindow::ChangeZPos(ZPOSITION zPos, bool all) { if(!m_ChildWindow) { + HWND parent = GetAncestor(m_Window, GA_PARENT); HWND winPos = HWND_NOTOPMOST; m_WindowZPosition = zPos; @@ -876,6 +877,10 @@ void CMeterWindow::ShowMeter(const WCHAR* name, bool group) } (*j)->Show(); + if ((*j)->GetToolTipHandle() != NULL) + { + SendMessage((*j)->GetToolTipHandle(), TTM_ACTIVATE, TRUE, NULL); + } m_ResetRegion = true; // Need to recalculate the window region if (!group) return; } @@ -906,6 +911,10 @@ void CMeterWindow::HideMeter(const WCHAR* name, bool group) } (*j)->Hide(); + if ((*j)->GetToolTipHandle() != NULL) + { + SendMessage((*j)->GetToolTipHandle(), TTM_ACTIVATE, FALSE, NULL); + } m_ResetRegion = true; // Need to recalculate the windowregion if (!group) return; } @@ -938,10 +947,18 @@ void CMeterWindow::ToggleMeter(const WCHAR* name, bool group) if ((*j)->IsHidden()) { (*j)->Show(); + if ((*j)->GetToolTipHandle() != NULL) + { + SendMessage((*j)->GetToolTipHandle(), TTM_ACTIVATE, TRUE, NULL); + } } else { (*j)->Hide(); + if ((*j)->GetToolTipHandle() != NULL) + { + SendMessage((*j)->GetToolTipHandle(), TTM_ACTIVATE, FALSE, NULL); + } } m_ResetRegion = true; // Need to recalculate the window region if (!group) return; @@ -1452,8 +1469,6 @@ void CMeterWindow::ReadConfig() m_AlphaValue = 255; m_FadeDuration = 250; - std::wstring group = L""; - CConfigParser parser; parser.Initialize(iniFile.c_str(), m_Rainmeter); @@ -1533,9 +1548,6 @@ void CMeterWindow::ReadConfig() m_FadeDuration = parser.ReadInt(section, L"FadeDuration", m_FadeDuration); - group = parser.ReadString(section, L"Group", group.c_str()); - InitializeGroup(group); - // On the second loop override settings from the skin's section section = m_SkinName.c_str(); } diff --git a/revision-number.h b/revision-number.h index 2a9d7048..50316212 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,2 +1,2 @@ #pragma once -const int revision_number = 470; \ No newline at end of file +const int revision_number = 472; \ No newline at end of file