From 007d5cd3398c7e82a5bbfe29131323c7c2ea379b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Jan 2021 21:25:09 +0300 Subject: fixes #2701 (Remove artifact from Scriver popups options) --- plugins/Scriver/res/resource.rc | 36 ++++++++++++++++++++++-------------- plugins/Scriver/src/chat_options.cpp | 18 ------------------ 2 files changed, 22 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index 3324c7bfe1..30b372f02c 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -292,25 +292,24 @@ BEGIN LTEXT "KB",IDC_CHAT_LIMITTEXT2,290,214,10,8 END -IDD_OPTIONSPOPUP DIALOGEX 0, 0, 304, 232 +IDD_OPTIONSPOPUP DIALOGEX 0, 0, 304, 95 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Group chat",IDC_STATIC,0,0,304,229 - CONTROL "Tree1",IDC_CHAT_CHECKBOXES,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,8,12,288,132 + GROUPBOX "Group chat",IDC_STATIC,0,0,304,91 CONTROL "Use same style as in the message log",IDC_CHAT_RADIO1, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,149,225,10 - CONTROL "Use default colors",IDC_CHAT_RADIO2,"Button",BS_AUTORADIOBUTTON,8,160,200,10 - CONTROL "Use custom colors",IDC_CHAT_RADIO3,"Button",BS_AUTORADIOBUTTON,8,171,200,10 - LTEXT "Text",IDC_STATIC,20,182,200,8 - CONTROL "Custom1",IDC_CHAT_TEXT,"ColourPicker",WS_TABSTOP,120,182,40,11,WS_EX_NOACTIVATE | 0x10000000L - LTEXT "Background",IDC_STATIC,20,194,67,8 - CONTROL "Custom2",IDC_CHAT_BKG,"ColourPicker",WS_TABSTOP,120,194,40,11,WS_EX_NOACTIVATE | 0x10000000L - LTEXT "Timeout (s)",IDC_STATIC,8,213,92,8 - EDITTEXT IDC_CHAT_TIMEOUT,125,209,30,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Spin1",IDC_CHAT_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,155,210,11,12 - LTEXT "(0 means default setting, -1 means indefinite time)",IDC_STATIC,170,208,130,19 + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,11,225,10 + CONTROL "Use default colors",IDC_CHAT_RADIO2,"Button",BS_AUTORADIOBUTTON,8,22,200,10 + CONTROL "Use custom colors",IDC_CHAT_RADIO3,"Button",BS_AUTORADIOBUTTON,8,33,200,10 + LTEXT "Text",IDC_STATIC,20,44,200,8 + CONTROL "Custom1",IDC_CHAT_TEXT,"ColourPicker",WS_TABSTOP,120,44,40,11,WS_EX_NOACTIVATE | 0x10000000L + LTEXT "Background",IDC_STATIC,20,56,67,8 + CONTROL "Custom2",IDC_CHAT_BKG,"ColourPicker",WS_TABSTOP,120,56,40,11,WS_EX_NOACTIVATE | 0x10000000L + LTEXT "Timeout (s)",IDC_STATIC,8,75,92,8 + EDITTEXT IDC_CHAT_TIMEOUT,125,71,30,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Spin1",IDC_CHAT_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,155,72,11,12 + LTEXT "(0 means default setting, -1 means indefinite time)",IDC_STATIC,170,70,130,19 END @@ -393,6 +392,10 @@ BEGIN BEGIN END + IDD_OPTIONS2, DIALOG + BEGIN + END + IDD_OPTIONSPOPUP, DIALOG BEGIN END @@ -589,6 +592,11 @@ BEGIN 0 END +IDD_OPTIONSPOPUP AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp index 5bddd629d1..b84b34ab5a 100644 --- a/plugins/Scriver/src/chat_options.cpp +++ b/plugins/Scriver/src/chat_options.cpp @@ -560,7 +560,6 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES); SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_SETCOLOUR, 0, g_Settings.crPUBkgColour); SendDlgItemMessage(hwndDlg, IDC_CHAT_TEXT, CPM_SETCOLOUR, 0, g_Settings.crPUTextColour); @@ -596,23 +595,6 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar case WM_NOTIFY: switch (((LPNMHDR)lParam)->idFrom) { - case IDC_CHAT_CHECKBOXES: - if (((LPNMHDR)lParam)->code == NM_CLICK) { - TVHITTESTINFO hti; - hti.pt.x = (short)LOWORD(GetMessagePos()); - hti.pt.y = (short)HIWORD(GetMessagePos()); - ScreenToClient(((LPNMHDR)lParam)->hwndFrom, &hti.pt); - if (TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &hti)) - if (hti.flags & TVHT_ONITEMSTATEICON) - SendMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)hti.hItem); - } - else if (((LPNMHDR)lParam)->code == TVN_KEYDOWN) { - if (((LPNMTVKEYDOWN)lParam)->wVKey == VK_SPACE) - SendMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, - (LPARAM)TreeView_GetSelection(((LPNMHDR)lParam)->hwndFrom)); - } - break; - case 0: switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: -- cgit v1.2.3