Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

One-Hand mice merge without horizontal wheel #2580

Closed
wants to merge 3 commits into from
Closed

One-Hand mice merge without horizontal wheel #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62eb1e5
One-Hand mice merge without horizontal wheel
lededev Dec 18, 2024
0aead50
Simplified "merge" to left and middle mouse buttons
lededev Dec 20, 2024
814cf9e
clean unused state
Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Src/MainFrm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2808,17 +2808,18 @@ BOOL CMainFrame::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult)
return FALSE;
strTipText = strFullText.substr(newline1st + 1).c_str();
}
constexpr size_t tipBufLen = 512;
if (pNMHDR->code == TTN_NEEDTEXTA)
{
m_upszLongTextA.reset(new CHAR[256]);
m_upszLongTextA.reset(new CHAR[tipBufLen]);
pTTTA->lpszText = m_upszLongTextA.get();
_wcstombsz(pTTTA->lpszText, strTipText, 256);
_wcstombsz(pTTTA->lpszText, strTipText, tipBufLen);
}
else
{
m_upszLongTextW.reset(new WCHAR[256]);
m_upszLongTextW.reset(new WCHAR[tipBufLen]);
pTTTW->lpszText = m_upszLongTextW.get();
lstrcpyn(pTTTW->lpszText, strTipText, 256);
lstrcpyn(pTTTW->lpszText, strTipText, tipBufLen);
}
*pResult = 0;

Expand Down
8 changes: 4 additions & 4 deletions Src/Merge.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4574,10 +4574,10 @@ STRINGTABLE
BEGIN
ID_MICE_PREVDIFF "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)"
ID_MICE_NEXTDIFF "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)"
ID_MICE_L2R "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Alt+Shift+Wheel Down)"
ID_MICE_R2L "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)"
ID_MICE_L2RNEXT "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
ID_MICE_R2LNEXT "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
ID_MICE_L2R "\nCopy to Right (Alt+Right)\n(Right Button+Middle Button)\n(Right Button+Wheel Right)\n(Alt+Wheel Right)\n(Right Button+Shift+Wheel Down)\n(Alt+Shift+Wheel Down)"
ID_MICE_R2L "\nCopy to Left (Alt+Left)\n(Right Button+Left Button)\n(Right Button+Wheel Left)\n(Alt+Wheel Left)\n(Right Button+Shift+Wheel Up)\n(Alt+Shift+Wheel Up)"
ID_MICE_L2RNEXT "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Right Button+Middle Button)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)"
ID_MICE_R2LNEXT "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Right Button+Left Button)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"
END

STRINGTABLE
Expand Down
Loading
Loading