diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-21 13:17:19 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-21 13:17:19 +0000 |
| commit | dc16fa8c5fa2e477b6ce896b8eb237462735baae (patch) | |
| tree | 0decd239db25aa48a16ec6b4da49a1f678f3cedc /plugins | |
| parent | 6465dd41cc06b5952e77ccc72396627abf385a17 (diff) | |
fix for window flashing in StdChat & Scriver
git-svn-id: http://svn.miranda-ng.org/main/trunk@7809 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Scriver/src/chat/main.cpp | 19 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/tools.cpp | 8 |
2 files changed, 18 insertions, 9 deletions
diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index 37dc0bb167..bb86a5013c 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -106,12 +106,24 @@ static void OnSetStatus(SESSION_INFO *si, int wStatus) PostMessage(si->hWnd, GC_FIXTABICONS, 0, 0);
}
+static void OnFlashHighlight(SESSION_INFO *si, int bInactive)
+{
+ if (!bInactive || !si->hWnd)
+ return;
+
+ if (g_Settings.bFlashWindowHighlight)
+ SendMessage(GetParent(si->hWnd), CM_STARTFLASHING, 0, 0);
+ SendMessage(si->hWnd, GC_SETMESSAGEHIGHLIGHT, 0, 0);
+}
+
static void OnFlashWindow(SESSION_INFO *si, int bInactive)
{
- if (bInactive && si->hWnd && g_Settings.bFlashWindowHighlight)
+ if (!bInactive || !si->hWnd)
+ return;
+
+ if (g_Settings.bFlashWindow)
SendMessage(GetParent(si->hWnd), CM_STARTFLASHING, 0, 0);
- if (bInactive && si->hWnd)
- SendMessage(si->hWnd, GC_SETMESSAGEHIGHLIGHT, 0, 0);
+ SendMessage(si->hWnd, GC_SETTABHIGHLIGHT, 0, 0);
}
static void OnCreateModule(MODULEINFO *mi)
@@ -195,6 +207,7 @@ int Chat_Load() pci->OnEventBroadcast = OnEventBroadcast;
pci->OnSetStatusBar = OnSetStatusBar;
pci->OnFlashWindow = OnFlashWindow;
+ pci->OnFlashHighlight = OnFlashHighlight;
pci->ShowRoom = ShowRoom;
pci->DoPopup = DoPopup;
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index a70018736a..f57a8b9f8c 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -338,16 +338,14 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight DoTrayIcon(si, gce);
}
- /* TODO fix for 3.0 final !!! */
-#if !defined(__DELAYED_FOR_3_1)
- if (g_Settings.bCreateWindowOnHighlight && 0 == dat)
+ if (g_Settings.bCreateWindowOnHighlight && dat == NULL)
wParamForHighLight = 1;
if (dat && g_Settings.bAnnoyingHighlight && params->bInactive && dat->pContainer->hwnd != GetForegroundWindow()) {
wParamForHighLight = 2;
params->hWnd = dat->hwnd;
}
-#endif
+
if (dat || !nen_options.iMUCDisable)
DoPopup(si, gce);
if (params->bInactive && si && si->hWnd)
@@ -600,14 +598,12 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO AppendMenu(*hMenu, dwState | MF_CHECKED | MF_STRING, gcmi.Item[i].dwID, ptszText);
}
-#if !defined(__DELAYED_FOR_3_1)
if (iIndex == 0) {
AppendMenu(*hMenu, MF_SEPARATOR, 0, 0);
int pos = GetMenuItemCount(*hMenu);
InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20020, TranslateT("Highlight User..."));
InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20021, TranslateT("Edit Highlight List..."));
}
-#endif
return TrackPopupMenu(*hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);
}
|