From 615db90328ab27beb166c3db19a7a0326fb1345a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 8 Dec 2016 18:40:59 +0300 Subject: - improperly removed line returned back - minor code cleaning --- plugins/Scriver/src/chat/window.cpp | 8 ++------ plugins/Scriver/src/msgdialog.cpp | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index c7e8ce8c4a..aa3746fb5b 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -80,7 +80,6 @@ static void InitButtons(HWND hwndDlg, SESSION_INFO *si) static void MessageDialogResize(HWND hwndDlg, SESSION_INFO *si, int w, int h) { - int logBottom, toolbarTopY; bool bNick = si->iType != GCW_SERVER && si->bNicklistEnabled; bool bToolbar = SendMessage(GetParent(hwndDlg), CM_GETTOOLBARSTATUS, 0, 0) != 0; int hSplitterMinTop = TOOLBAR_HEIGHT + si->minLogBoxHeight, hSplitterMinBottom = si->minEditBoxHeight; @@ -112,11 +111,8 @@ static void MessageDialogResize(HWND hwndDlg, SESSION_INFO *si, int w, int h) } HDWP hdwp = BeginDeferWindowPos(5); - toolbarTopY = bToolbar ? h - si->iSplitterY - toolbarHeight : h - si->iSplitterY; - if (si->hwndLog != NULL) - logBottom = toolbarTopY / 2; - else - logBottom = toolbarTopY; + int toolbarTopY = bToolbar ? h - si->iSplitterY - toolbarHeight : h - si->iSplitterY; + int logBottom = (si->hwndLog != NULL) ? toolbarTopY / 2 : toolbarTopY; hdwp = DeferWindowPos(hdwp, GetDlgItem(hwndDlg, IDC_LOG), 0, 1, 0, bNick ? w - si->iSplitterX - 1 : w - 2, logBottom, SWP_NOZORDER); hdwp = DeferWindowPos(hdwp, GetDlgItem(hwndDlg, IDC_CHAT_LIST), 0, w - si->iSplitterX + 2, 0, si->iSplitterX - 3, toolbarTopY, SWP_NOZORDER); diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 8767b67984..93d659545d 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -768,6 +768,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendMessage(hwndButton, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(cbd->m_hIcon)); } + SendMessage(hwndDlg, DM_CHANGEICONS, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETOLECALLBACK, 0, (LPARAM)&reOleCallback); SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_LINK | ENM_KEYEVENTS); SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR); -- cgit v1.2.3