summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2023-11-08 18:28:42 +0300
committerGeorge Hazan <george.hazan@gmail.com>2023-11-08 18:28:42 +0300
commiteebfe35f7b33e1d2d307369ce440e8c3239a79ac (patch)
tree5cbfc5f321f3ac58663daa00f3952c47918d9fd7
parentcaaaf9ffe9ac3c28f2e9459ac4afb34fcd59f72d (diff)
fixes #3825 (YAMN: настройки всплывающих окон всё ещё имеют визуальные артефакты)
-rw-r--r--protocols/YAMN/res/YAMN.rc4
-rw-r--r--protocols/YAMN/src/proto/pop3/pop3opt.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/YAMN/res/YAMN.rc b/protocols/YAMN/res/YAMN.rc
index c8612a4719..3c4d83b74c 100644
--- a/protocols/YAMN/res/YAMN.rc
+++ b/protocols/YAMN/res/YAMN.rc
@@ -219,7 +219,7 @@ BEGIN
END
IDD_POP3ACCOUNTPOPUP DIALOGEX 0, 0, 315, 237
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
@@ -231,7 +231,7 @@ BEGIN
CONTROL "Use custom color",IDC_CHECKCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,83,107,10
CONTROL "",IDC_CPB,"ColourPicker",WS_TABSTOP,145,66,29,12
CONTROL "",IDC_CPT,"ColourPicker",WS_TABSTOP,145,82,29,12
- EDITTEXT IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL
GROUPBOX "No new mail notifications",IDC_GBNONEWMAIL,0,152,309,62
CONTROL "Popup if no mail",IDC_CHECKNPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,94,10
CONTROL "Persistent message",IDC_CHECKNMSGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,188,110,10
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index bfec6d09e4..4ee9ff52a0 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -831,7 +831,6 @@ public:
{
WindowList_Add(MessageWnds, m_hwnd);
- DlgEnableAccountPopup(false);
DlgShowAccountPopup();
{
SReadGuard srb(POP3Plugin->AccountBrowserSO);
@@ -840,7 +839,7 @@ public:
if (ActualAccount->Name != nullptr)
cmbAccount.AddStringA(ActualAccount->Name);
}
- ActualAccount = nullptr;
+
cmbAccount.SetCurSel(0);
onSelChange_Account(0);
return true;
@@ -944,6 +943,7 @@ public:
SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_GETLBTEXT, (WPARAM)Result, (LPARAM)DlgInput);
if ((Result == CB_ERR) || (nullptr == (ActualAccount = (CPOP3Account*)FindAccountByName(POP3Plugin, DlgInput)))) {
DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+ DlgEnableAccountPopup(false);
}
else {
DlgShowAccount(ActualAccount);