From 1d36c40c935c741df008ddd80fc028301ce1e7ec Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 30 Jan 2023 18:32:02 +0300 Subject: =?UTF-8?q?fixes=20#3321=20(=D0=9D=D0=B5=D0=B2=D0=BE=D0=B7=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=B2=D1=81=D1=82=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=20=D0=B2=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/res/resource.rc | 22 +++++++++++----------- src/mir_app/src/menu_options.cpp | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src') 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); -- cgit v1.2.3