summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-03-05 21:11:35 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-03-05 21:11:35 +0300
commitd3078120b812849fbc823f90b23fd95f1d286398 (patch)
treeff271cc38b5e7765f0ecbaa90dc8287c42a2563c /plugins
parent38e9a47650627d9130977b0ff719d5fc8ede6277 (diff)
Scriver: "entry area min size in lines" setting doesn't work
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Scriver/src/globals.cpp2
-rw-r--r--plugins/Scriver/src/msgdialog.cpp5
-rw-r--r--plugins/Scriver/src/stdafx.h5
3 files changed, 9 insertions, 3 deletions
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 52f0525a3f..485b7c117b 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -276,9 +276,9 @@ void LoadInfobarFonts()
LOGFONT lf;
LoadMsgDlgFont(MSGFONTID_MESSAGEAREA, &lf, NULL);
g_dat.minInputAreaHeight = db_get_dw(NULL, SRMMMOD, SRMSGSET_AUTORESIZELINES, SRMSGDEFSET_AUTORESIZELINES) * abs(lf.lfHeight) * g_dat.logPixelSY / 72;
+
if (g_dat.hInfobarBrush != NULL)
DeleteObject(g_dat.hInfobarBrush);
-
g_dat.hInfobarBrush = CreateSolidBrush(db_get_dw(NULL, SRMMMOD, SRMSGSET_INFOBARBKGCOLOUR, SRMSGDEFSET_INFOBARBKGCOLOUR));
}
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index f14ce90112..55609342cd 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -438,6 +438,9 @@ void CSrmmWindow::MessageDialogResize(int w, int h)
int toolbarWidth = w;
int messageEditWidth = w - 2;
+ if (hSplitterMinBottom < g_dat.minInputAreaHeight)
+ hSplitterMinBottom = g_dat.minInputAreaHeight;
+
if (!(pdat->flags2 & SMF2_SHOWINFOBAR)) {
infobarHeight = 0;
infobarInnerHeight = 0;
@@ -705,6 +708,8 @@ void CSrmmWindow::OnInitDialog()
RECT rc;
GetWindowRect(m_message.GetHwnd(), &rc);
m_minLogBoxHeight = m_minEditBoxHeight = rc.bottom - rc.top;
+ if (m_minEditBoxHeight < g_dat.minInputAreaHeight)
+ m_minEditBoxHeight = g_dat.minInputAreaHeight;
if (m_pParent->iSplitterY == -1)
m_pParent->iSplitterY = m_minEditBoxHeight;
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 0305e13fe7..ff98862e51 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -89,13 +89,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern HWND SM_FindWindowByContact(MCONTACT hContact);
extern HINSTANCE g_hInst;
-extern void ChangeStatusIcons();
-extern void LoadInfobarFonts();
extern HCURSOR hDragCursor;
extern ITaskbarList3 *pTaskbarInterface;
extern HMENU g_hMenu;
extern HANDLE hHookWinPopup, hHookWinWrite, hHookWinEvt;
+void ChangeStatusIcons();
+void LoadInfobarFonts();
+
#define SPLITTER_HEIGHT 4
#define TOOLBAR_HEIGHT 24
#define INFO_BAR_HEIGHT 54