summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/TabSRMM/src/msgdialog.cpp3
-rw-r--r--plugins/TabSRMM/src/msgoptions.cpp1
-rw-r--r--plugins/TabSRMM/src/msgs.h2
-rw-r--r--plugins/TabSRMM/src/srmm.cpp1
4 files changed, 5 insertions, 2 deletions
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index ad732fa480..56ee17a4bc 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1807,7 +1807,8 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
}
if (isCtrl && !isAlt && !isShift) {
- if (wParam == VK_UP || wParam == VK_DOWN) { // input history scrolling (ctrl-up / down)
+ // input history scrolling (ctrl-up / down)
+ if (g_plugin.bScrollHistory && (wParam == VK_UP || wParam == VK_DOWN)) {
m_cache->inputHistoryEvent(wParam);
return 0;
}
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 316b52b516..2c4f020055 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -397,6 +397,7 @@ public:
auto *pwszSection = LPGENW("Message window behavior");
treeOpts.AddOption(pwszSection, LPGENW("Always flash contact list and tray icon for new messages"), g_plugin.bFlashOnClist);
treeOpts.AddOption(pwszSection, LPGENW("Delete temporary contacts on close"), g_plugin.bDeleteTemp);
+ treeOpts.AddOption(pwszSection, LPGENW("Use Ctrl+arrows to scroll history in the input window"), g_plugin.bScrollHistory);
pwszSection = LPGENW("Sending messages");
treeOpts.AddOption(pwszSection, LPGENW("Minimize the message window on send"), g_plugin.bAutoMin);
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index a2e8ce4ed9..d2ed22b642 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -1016,7 +1016,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
HANDLE hLogger;
// window settings
- CMOption<bool> bAutoMin, bAutoClose, bFlashOnClist, bDeleteTemp;
+ CMOption<bool> bAutoMin, bAutoClose, bFlashOnClist, bDeleteTemp, bScrollHistory;
CMOption<bool> bPasteAndSend, bAutoSplit, bUseSameSplitSize, bAutoCopy;
CMOption<bool> bStatusOnTabs, bUseXStatus, bDetailedTooltips, bAllowOfflineMultisend;
CMOption<bool> bAutoPopup, bAutoTabs, bAutoSwitchTabs, bAutoContainer, bPopupContainer, bHideOnClose, bAllowTab;
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 793b4be3b9..6c70f24694 100644
--- a/plugins/TabSRMM/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
@@ -68,6 +68,7 @@ CMPlugin::CMPlugin() :
bStatusOnTabs(SRMSGMOD_T, "tabstatus", true),
bFlashOnClist(SRMSGMOD_T, "flashcl", false),
bPasteAndSend(SRMSGMOD_T, "pasteandsend", true),
+ bScrollHistory(SRMSGMOD_T, "scrollhistory", true),
bAutoContainer(SRMSGMOD_T, "autocontainer", true),
bAutoSwitchTabs(SRMSGMOD_T, "autoswitchtabs", true),
bPopupContainer(SRMSGMOD_T, "cpopup", true),