diff options
| author | George Hazan <ghazan@miranda.im> | 2019-08-30 15:20:16 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-08-30 15:20:16 +0300 |
| commit | ca52c77ab6e2b8f9fe85bd6ce8ba82129734fb84 (patch) | |
| tree | e06b16d1524c6cf3969337f94ece17fea624934b /plugins/Scriver/src/msgs.cpp | |
| parent | a8f4c176d9983951d3f1b9803e08c7170a27eacd (diff) | |
Scriver:
- fixes #2037 (when tabs are used, "Save settings for contacts" corrupts window position);
- rest of tabs options switched to UI;
- version bump
Diffstat (limited to 'plugins/Scriver/src/msgs.cpp')
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 7569692e0f..adf8d22b98 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -27,8 +27,6 @@ HCURSOR hDragCursor; HGENMENU hMsgMenuItem;
HMODULE hMsftEdit;
-extern HWND GetParentWindow(MCONTACT hContact, BOOL bChat);
-
#define SCRIVER_DB_GETEVENTTEXT "Scriver/GetText"
static int SRMMStatusToPf2(int status)
@@ -55,7 +53,7 @@ static int SRMMStatusToPf2(int status) }
int IsAutoPopup(MCONTACT hContact) {
- if (g_dat.flags & SMF_AUTOPOPUP) {
+ if (g_dat.flags.bAutoPopup) {
char *szProto = GetContactProto(hContact);
hContact = db_mc_getSrmmSub(hContact);
@@ -182,7 +180,7 @@ static INT_PTR TypingMessageCommand(WPARAM, LPARAM lParam) static int TypingMessage(WPARAM hContact, LPARAM lParam)
{
- if (!(g_dat.flags2 & SMF2_SHOWTYPING))
+ if (!g_dat.flags2.bShowTyping)
return 0;
hContact = db_mc_tryMeta(hContact);
@@ -192,10 +190,10 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) HWND hwnd = Srmm_FindWindow(hContact);
if (hwnd)
SendMessage(hwnd, DM_TYPING, 0, lParam);
- else if (lParam && (g_dat.flags2 & SMF2_SHOWTYPINGTRAY)) {
+ else if (lParam && g_dat.flags2.bShowTypingTray) {
wchar_t szTip[256];
mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));
- if (g_dat.flags2 & SMF2_SHOWTYPINGCLIST) {
+ if (g_dat.flags2.bShowTypingClist) {
g_clistApi.pfnRemoveEvent(hContact, 1);
CLISTEVENT cle = {};
@@ -354,7 +352,7 @@ void CScriverWindow::Reattach(HWND hwndContainer) hParent = WindowList_Find(g_dat.hParentWindowList, (UINT_PTR)hParent);
if ((hParent != nullptr && hParent != hwndContainer) || (hParent == nullptr && m_pParent->childrenCount > 1 && (GetKeyState(VK_CONTROL) & 0x8000))) {
if (hParent == nullptr) {
- hParent = GetParentWindow(hContact, FALSE);
+ hParent = GetParentWindow(hContact, false);
RECT rc;
GetWindowRect(hParent, &rc);
|