diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-28 11:05:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-28 11:05:10 +0000 |
| commit | 90c2f2a24e911c832e11fcc6443afd24efdd4cc9 (patch) | |
| tree | 719972a0755925073ab6aeb7aa24e92eed5b1427 /plugins/TabSRMM/src/msgdlgutils.cpp | |
| parent | f302909f341c5bf61bcb432d73443df6c3ba44c9 (diff) | |
- fix for name conflict in proto helpers;
- switch to constants defined in m_nudge.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@5504 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/msgdlgutils.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 2385b9fed7..11901b9fa6 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -2184,7 +2184,7 @@ void TSAPI EnableSendButton(const TWindowData *dat, int iMode) void TSAPI SendNudge(const TWindowData *dat)
{
- if ( ProtoServiceExists(dat->cache->getActiveProto(), "/SendNudge") && ServiceExists(MS_NUDGE_SEND))
+ if ( ProtoServiceExists(dat->cache->getActiveProto(), PS_SEND_NUDGE) && ServiceExists(MS_NUDGE_SEND))
CallService(MS_NUDGE_SEND, (WPARAM)dat->cache->getActiveContact(), 0);
else
SendMessage(dat->hwnd, DM_ACTIVATETOOLTIP, IDC_MESSAGE,
@@ -2374,11 +2374,11 @@ LONG TSAPI GetDefaultMinimumInputHeight(const TWindowData* dat) LONG height = MINSPLITTERY;
if (dat) {
- if (dat->bType == SESSIONTYPE_IM)
+ if (dat->bType == SESSIONTYPE_IM)
height = ((dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR) ? DPISCALEY_S(46 + 22) : DPISCALEY_S(46));
else
height = ((dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR) ? DPISCALEY_S(22 + 46) : DPISCALEY_S(46)) - DPISCALEY_S(23);
-
+
if (CSkin::m_skinEnabled && !SkinItems[ID_EXTBKINPUTAREA].IGNORED)
height += (SkinItems[ID_EXTBKINPUTAREA].MARGIN_BOTTOM + SkinItems[ID_EXTBKINPUTAREA].MARGIN_TOP - 2);
}
|