CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3140 from RaiKoHoff/Dev_Release

Browse Source 
Wrap-Around tooltip: use correct encoding
This commit is contained in:
Rainer Kottenhoff 2021-02-26 09:01:51 +01:00 committed by GitHub
commit 3bec6f47b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Notepad3.c
View File

@ -8775,7 +8775,6 @@ void UpdateStatusbar(bool bForceRedraw)
//=============================================================================
const static char* const FR_StatusA[] = { "[>--<]", "[>>--]", "[>>-+]", "[+->]>", "[--<<]", "[+-<<]", "<[<-+]"};
const static WCHAR* const FR_StatusW[] = { L"[>--<]", L"[>>--]", L"[>>-+]", L"[+->]>", L"[--<<]", L"[+-<<]", L"<[<-+]"};
static void _UpdateStatusbarDelayed(bool bForceRedraw)
@ -11137,16 +11136,17 @@ void ShowZoomCallTip()
void ShowWrapAroundCallTip(bool forwardSearch)
{
int const delayClr = Settings2.WrapAroundTooltipTimeout;
if (delayClr >= (10*USER_TIMER_MINIMUM)) {
char chToolTipFmt[64] = { '\0' };
static char chToolTip[80] = { '\0' };
if (delayClr >= (USER_TIMER_MINIMUM<<4)) {
WCHAR wchToolTipFmt[64] = { '\0' };
WCHAR wchToolTip[80] = { '\0' };
static char chToolTip[80*3] = { '\0' };
if (forwardSearch) {
GetLngStringA(IDS_MUI_WRAPSEARCH_FWD, chToolTipFmt, COUNTOF(chToolTipFmt));
GetLngString(IDS_MUI_WRAPSEARCH_FWD, wchToolTipFmt, COUNTOF(wchToolTipFmt));
} else {
GetLngStringA(IDS_MUI_WRAPSEARCH_BCK, chToolTipFmt, COUNTOF(chToolTipFmt));
GetLngString(IDS_MUI_WRAPSEARCH_BCK, wchToolTipFmt, COUNTOF(wchToolTipFmt));
}
StringCchPrintfA(chToolTip, COUNTOF(chToolTip), chToolTipFmt, FR_StatusA[Globals.FindReplaceMatchFoundState]);
StringCchPrintf(wchToolTip, COUNTOF(wchToolTip), wchToolTipFmt, FR_StatusW[Globals.FindReplaceMatchFoundState]);
WideCharToMultiByte(Encoding_SciCP, 0, wchToolTip, -1, chToolTip, (int)COUNTOF(chToolTip), NULL, NULL);
SciCall_CallTipShow(SciCall_GetCurrentPos(), chToolTip);
_DelayClearCallTip(delayClr);
} else {