diff options
| author | George Hazan <ghazan@miranda.im> | 2023-01-30 18:32:02 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-01-30 18:32:02 +0300 |
| commit | 1d36c40c935c741df008ddd80fc028301ce1e7ec (patch) | |
| tree | 5213344ef0f1c92df7413452b08afa743d67755b /src | |
| parent | 7feec12561efcc27c316101952a6de24e1264472 (diff) | |
fixes #3321 (Невозможно вставить разделитель в подменю)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/res/resource.rc | 22 | ||||
| -rw-r--r-- | src/mir_app/src/menu_options.cpp | 3 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 3c07d9ce6f..628d23ac93 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -461,11 +461,11 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Menu objects",IDC_STATIC,5,2,140,81
- LISTBOX IDC_MENUOBJECTS,11,13,128,79,WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Menu objects",IDC_STATIC,5,2,140,77
+ LISTBOX IDC_MENUOBJECTS,11,14,128,66,WS_VSCROLL | WS_TABSTOP
GROUPBOX "Menu items",IDC_STATIC,149,2,161,248
CONTROL "Tree1",IDC_MENUITEMS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_NOHSCROLL | WS_DISABLED | WS_BORDER | WS_TABSTOP,156,13,148,212
- GROUPBOX "Protocol menus",IDC_STATIC,5,84,140,37
+ GROUPBOX "Protocol menus",IDC_STATIC,5,81,140,41
CONTROL "Move to the main menu",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,11,95,128,8
CONTROL "Move to the status bar",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,11,107,130,8
LTEXT "Warning!\r\nThis menu object not support user defined options.",IDC_NOTSUPPORTWARNING,10,124,136,32,NOT WS_VISIBLE
@@ -1563,16 +1563,16 @@ BEGIN MENUITEM SEPARATOR
POPUP "Word lookup", GRAYED
BEGIN
- MENUITEM "Google", IDM_SEARCH_GOOGLE
- MENUITEM "Bing", IDM_SEARCH_BING
- MENUITEM "Yandex", IDM_SEARCH_YANDEX
- MENUITEM "Wikipedia (en)", IDM_SEARCH_WIKIPEDIA
+ MENUITEM "Google", IDM_SEARCH_GOOGLE
+ MENUITEM "Bing", IDM_SEARCH_BING
+ MENUITEM "Yandex", IDM_SEARCH_YANDEX
+ MENUITEM "Wikipedia (en)", IDM_SEARCH_WIKIPEDIA
MENUITEM SEPARATOR
- MENUITEM "Google Maps", IDM_SEARCH_GOOGLE_MAPS
- MENUITEM "Google Translate", IDM_SEARCH_GOOGLE_TRANSLATE
+ MENUITEM "Google Maps", IDM_SEARCH_GOOGLE_MAPS
+ MENUITEM "Google Translate", IDM_SEARCH_GOOGLE_TRANSLATE
MENUITEM SEPARATOR
- MENUITEM "Yahoo", IDM_SEARCH_YAHOO
- MENUITEM "Foodnetwork", IDM_SEARCH_FOODNETWORK
+ MENUITEM "Yahoo", IDM_SEARCH_YAHOO
+ MENUITEM "Foodnetwork", IDM_SEARCH_FOODNETWORK
END
END
END
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp index 01a8c7594f..d36034535c 100644 --- a/src/mir_app/src/menu_options.cpp +++ b/src/mir_app/src/menu_options.cpp @@ -390,10 +390,11 @@ public: PD->pos = ((MenuItemOptData *)tvi.lParam)->pos - 1;
TVINSERTSTRUCT tvis = {};
+ tvis.hParent = m_menuItems.GetParent(hti);
+ tvis.hInsertAfter = hti;
tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE;
tvis.item.lParam = (LPARAM)PD;
tvis.item.pszText = PD->name;
- tvis.hInsertAfter = hti;
tvis.item.state = INDEXTOSTATEIMAGEMASK(2);
tvis.item.stateMask = TVIS_STATEIMAGEMASK;
m_menuItems.InsertItem(&tvis);
|