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

Some adjustment changes for menuitem.

Browse Source
This commit is contained in:
spx 2011-08-29 19:35:18 +00:00
parent d5083961af
commit a1f0c4fd19
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Library.rc
View File

@ -111,7 +111,7 @@ IDR_SKIN_MENU MENU
BEGIN BEGIN
POPUP "Skin" POPUP "Skin"
BEGIN BEGIN
MENUITEM "", ID_CONTEXT_SKINMENU_OPENSKINSFOLDER MENUITEM " ", ID_CONTEXT_SKINMENU_OPENSKINSFOLDER // Avoid to be compiled as a separator
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "Variants" POPUP "Variants"
BEGIN BEGIN

8
Library/Rainmeter.cpp
View File

@ -3794,7 +3794,11 @@ void CRainmeter::ShowContextMenu(POINT pos, CMeterWindow* meterWindow)
HMENU themeMenu = GetSubMenu(subMenu, 5); HMENU themeMenu = GetSubMenu(subMenu, 5);
if (themeMenu) if (themeMenu)
{ {
CreateThemeMenu(themeMenu); if (!m_Themes.empty())
{
DeleteMenu(themeMenu, 0, MF_BYPOSITION);
CreateThemeMenu(themeMenu);
}
} }
if (meterWindow) if (meterWindow)
@ -3924,8 +3928,6 @@ void CRainmeter::CreateThemeMenu(HMENU themeMenu)
{ {
if (!m_Themes.empty()) if (!m_Themes.empty())
{ {
InsertMenu(themeMenu, 0, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
for (size_t i = 0, isize = m_Themes.size(); i < isize; ++i) for (size_t i = 0, isize = m_Themes.size(); i < isize; ++i)
{ {
InsertMenu(themeMenu, i, MF_BYPOSITION, ID_THEME_FIRST + i, m_Themes[i].c_str()); InsertMenu(themeMenu, i, MF_BYPOSITION, ID_THEME_FIRST + i, m_Themes[i].c_str());