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 1 Packages Projects Releases Wiki Activity

+chg: CallTip/ToolTip (zoom):

Browse Source 
using system's message font face (std: Segoe UI),
  foregr high-contrast on margin background color
This commit is contained in:
METANEOCORTEX\Kotti 2023-06-23 00:32:47 +02:00
parent 3223c67474
commit 0943acab55
6 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Edit.c
View File

@ -7132,7 +7132,7 @@ bool EditFindNext(HWND hwnd, const LPEDITFINDREPLACE lpefr, bool bExtendSelectio
DocPos start = SciCall_GetCurrentPos();
DocPos end = iDocEndPos;
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
DocPos iPos = _FindInTarget(wchFind, sFlags, &start, &end, true, FRMOD_NORM);
@ -7224,7 +7224,7 @@ bool EditFindPrev(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo
DocPos start = SciCall_GetCurrentPos();
DocPos end = 0LL;
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
DocPos iPos = _FindInTarget(wchFind, sFlags, &start, &end, true, FRMOD_NORM);

37
src/Helpers.c
View File

@ -741,6 +741,43 @@ bool IsFontAvailable(LPCWSTR lpszFontName) {
}
//=============================================================================
//
// GetNonClientMetricsA()
//
static LPNONCLIENTMETRICSA _GetNonClientMetricsA(bool bForceRefresh)
{
static NONCLIENTMETRICSA ncm = { 0 };
if (!ncm.cbSize || bForceRefresh) {
size_t const cbSize = sizeof(NONCLIENTMETRICSA);
ZeroMemory(&ncm, cbSize);
ncm.cbSize = (UINT)cbSize;
SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, (UINT)cbSize, &ncm, 0);
}
return &ncm;
}
void GetSystemCaptionFontA(LPSTR fontFaceName_out, bool bForceRefresh)
{
LPNONCLIENTMETRICSA const pncm = _GetNonClientMetricsA(bForceRefresh);
StringCchCopyA(fontFaceName_out, LF_FACESIZE, pncm->lfCaptionFont.lfFaceName);
}
void GetSystemMenuFontA(LPSTR fontFaceName_out, bool bForceRefresh)
{
LPNONCLIENTMETRICSA const pncm = _GetNonClientMetricsA(bForceRefresh);
StringCchCopyA(fontFaceName_out, LF_FACESIZE, pncm->lfMenuFont.lfFaceName);
}
void GetSystemMessageFontA(LPSTR fontFaceName_out, bool bForceRefresh)
{
LPNONCLIENTMETRICSA const pncm = _GetNonClientMetricsA(bForceRefresh);
StringCchCopyA(fontFaceName_out, LF_FACESIZE, pncm->lfMessageFont.lfFaceName);
}
void GetSystemStatusFontA(LPSTR fontFaceName_out, bool bForceRefresh)
{
LPNONCLIENTMETRICSA const pncm = _GetNonClientMetricsA(bForceRefresh);
StringCchCopyA(fontFaceName_out, LF_FACESIZE, pncm->lfStatusFont.lfFaceName);
}
//=============================================================================
//

5
src/Helpers.h
View File

@ -441,6 +441,11 @@ bool BitmapGrayScale(HBITMAP hbmp);
bool VerifyContrast(COLORREF cr1,COLORREF cr2);
bool IsFontAvailable(LPCWSTR lpszFontName);
void GetSystemCaptionFontA(LPSTR fontFaceName_out, bool bForceRefresh);
void GetSystemMenuFontA(LPSTR fontFaceName_out, bool bForceRefresh);
void GetSystemMessageFontA(LPSTR fontFaceName_out, bool bForceRefresh);
void GetSystemStatusFontA(LPSTR fontFaceName_out, bool bForceRefresh);
bool IsCmdEnabled(HWND hwnd, UINT uId);

48
src/Notepad3.c
View File

@ -4599,7 +4599,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case IDT_TIMER_CLEAR_CALLTIP:
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
break;
case IDT_TIMER_UNDO_TRANSACTION:
@ -6631,7 +6631,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
SciCall_AutoCCancel();
--skipLevel;
} else if (SciCall_CallTipActive()) {
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
s_bCallTipEscDisabled = true;
--skipLevel;
} else if (s_bInMultiEditMode) {
@ -7721,7 +7721,7 @@ void HandleDWellStartEnd(const DocPos position, const UINT uid)
case SCN_DWELLSTART: {
if (position < 0) {
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
prevCursorPosition = -1;
return;
}
@ -7730,7 +7730,7 @@ void HandleDWellStartEnd(const DocPos position, const UINT uid)
if (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, position) > 0) {
indicator_id = INDIC_NP3_HYPERLINK;
if (position != prevCursorPosition) {
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
}
}
}
@ -7845,8 +7845,8 @@ void HandleDWellStartEnd(const DocPos position, const UINT uid)
}
if (!StrIsEmptyA(chCallTip)) {
//SciCall_CallTipSetPosition(true);
// first show, then set highlight range
// SciCall_CallTipSetPosition(true);
SciCall_CallTipShow(position, chCallTip);
SciCall_CallTipSetHlt(0, (int)cch);
}
@ -7909,8 +7909,8 @@ void HandleDWellStartEnd(const DocPos position, const UINT uid)
break;
}
//SciCall_CallTipSetPosition(true);
// first show, then set highlight range
// SciCall_CallTipSetPosition(true);
SciCall_CallTipShow(position, chHex2Char);
SciCall_CallTipSetHlt(0, (int)length);
}
@ -7927,7 +7927,7 @@ void HandleDWellStartEnd(const DocPos position, const UINT uid)
return; // avoid flickering
}
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
DocPos const curPos = SciCall_GetCurrentPos();
if ((curPos >= prevStartPosition) && ((curPos <= prevEndPosition))) {
@ -7968,7 +7968,7 @@ bool HandleHotSpotURLClicked(const DocPos position, const HYPERLINK_OPS operatio
}
//~SciCall_PostMsg(WM_LBUTTONUP, MK_LBUTTON, 0);
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
bool bHandled = false;
if (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, position)) {
@ -8848,7 +8848,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const SCNotification* const scn)
case SCN_CHARADDED: {
int const ich = scn->ch;
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
if (Sci_IsMultiSelection()) {
SciCall_SetIndicatorCurrent(INDIC_NP3_MULTI_EDIT);
@ -11334,15 +11334,15 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
Flags.bSettingsFileSoftLocked = false;
UpdateSaveSettingsCmds();
if (SciCall_GetZoom() != 100) {
ShowZoomCallTip();
}
UndoRedoReset();
UpdateToolbar();
UpdateMargins(true);
UpdateStatusbar(true);
if (SciCall_GetZoom() != 100) {
ShowZoomCallTip();
}
return true;
}
@ -11525,9 +11525,6 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
else {
Sci_GotoPosChooseCaret(0);
}
if (SciCall_GetZoom() != 100) {
ShowZoomCallTip();
}
}
// Show warning: Unicode file loaded as ANSI
@ -11582,6 +11579,9 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
UpdateToolbar();
UpdateMargins(true);
UpdateStatusbar(true);
if (SciCall_GetZoom() != 100) {
ShowZoomCallTip();
}
Path_Release(hopen_file);
@ -12482,22 +12482,24 @@ void ResetMouseDWellTime()
//
void ShowZoomCallTip()
{
int const delayClr = Settings2.ZoomTooltipTimeout;
static char chToolTip[64] = { '\0' };
int const delayClr = Settings2.ZoomTooltipTimeout;
if (delayClr >= (_MQ_TIMER_CYCLE << 3)) {
int const iZoomLevelPercent = SciCall_GetZoom();
static char chToolTip[32] = { '\0' };
StringCchPrintfA(chToolTip, COUNTOF(chToolTip), "Zoom: %i%%", iZoomLevelPercent);
StringCchPrintfA(chToolTip, COUNTOF(chToolTip), "Zoom: %i%%", SciCall_GetZoom());
DocPos const iPos = SciCall_PositionFromLine(SciCall_GetFirstVisibleLine());
int const iXOff = SciCall_GetXOffset();
SciCall_SetXOffset(-4); // move away from margin
SciCall_CallTipSetPosition(true); // show above
SciCall_CallTipShow(iPos, chToolTip);
SciCall_SetXOffset(iXOff);
_DelayClearCallTip(delayClr);
} else {
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
}
}
@ -12508,10 +12510,10 @@ void ShowZoomCallTip()
//
void ShowWrapAroundCallTip(bool forwardSearch)
{
int const delayClr = Settings2.WrapAroundTooltipTimeout;
static char chToolTip[80<<2] = { '\0' };
int const delayClr = Settings2.WrapAroundTooltipTimeout;
if (delayClr >= (_MQ_TIMER_CYCLE << 3)) {
WCHAR wchToolTip[80] = { '\0' };
static char chToolTip[80*3] = { '\0' };
if (forwardSearch) {
GetLngString(IDS_MUI_WRAPSEARCH_FWD, wchToolTip, COUNTOF(wchToolTip));
} else {
@ -12522,7 +12524,7 @@ void ShowWrapAroundCallTip(bool forwardSearch)
SciCall_CallTipShow(SciCall_GetCurrentPos(), chToolTip);
_DelayClearCallTip(delayClr);
} else {
SciCall_CallTipCancel();
Sci_CallTipCancelEx();
}
}

2
src/SciCall.h
View File

@ -761,6 +761,8 @@ DeclareSciCallR0(IsIMEModeCJK, ISIMEMODECJK, bool);
DeclareSciCallR0(IsSelectionEmpty, GETSELECTIONEMPTY, bool);
DeclareSciCallR0(IsSelectionRectangle, SELECTIONISRECTANGLE, bool);
#define Sci_CallTipCancelEx() { SciCall_CallTipCancel(); SciCall_CallTipSetPosition(false); }
#define Sci_IsDocEmpty() (SciCall_GetTextLength() <= 0LL)
#define Sci_IsThinSelection() (SciCall_GetSelectionMode() == SC_SEL_THIN)

10
src/Styles.c
View File

@ -1353,6 +1353,7 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
// Indentation Guide
SciCall_StyleSetBack(STYLE_BRACELIGHT, dColor);
}
if (Settings2.UseOldStyleBraceMatching) {
Style_SetStyles(hwnd, pCurrentStandard->Styles[STY_BRACE_BAD].iStyle,
pCurrentStandard->Styles[STY_BRACE_BAD].szValue, fBaseFontSize); // brace bad
@ -2176,13 +2177,14 @@ void Style_SetMargin(HWND hwnd, LPCWSTR lpszStyle) /// iStyle == STYLE_LINENUMBE
// --- CallTips ---
//SciCall_CallTipSetFore(RGB(0x80, 0x80, 0x80)); // clrLineNumFore
//SciCall_CallTipSetBack(clrMarginBack);
SciCall_StyleSetFont(STYLE_CALLTIP, "Segoe UI");
//~SciCall_CallTipSetBack(clrMarginBack);
//~SciCall_CallTipSetFore(CalcContrastColor(clrMarginBack, 0)); // clrLineNumFore
char fontFaceName[LF_FACESIZE] = { '\0' };
GetSystemMessageFontA(fontFaceName, false); // "Segoe UI"
SciCall_StyleSetItalic(STYLE_CALLTIP, false);
SciCall_StyleSetBold(STYLE_CALLTIP, false);
SciCall_StyleSetFore(STYLE_CALLTIP, RGB(0x80, 0x80, 0x80)); // clrLineNumFore
SciCall_StyleSetBack(STYLE_CALLTIP, clrMarginBack);
SciCall_StyleSetFore(STYLE_CALLTIP, CalcContrastColor(clrMarginBack, 0)); // clrLineNumFore
SciCall_CallTipUseStyle(24); // tabsize
SciCall_CallTipSetForeHlt(clrLineNumFore);