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 #988 from RaiKoHoff/Dev_UCHARDET

Browse Source 
Change menu item "HighDPI Toolbar" -> "Toggle Toolbar"
This commit is contained in:
Rainer Kottenhoff 2019-03-05 11:30:50 +01:00 committed by GitHub
commit 3ecbe69f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
language/np3_af_za/menu_af_za.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "Nu&tsbalk"
BEGIN
MENUITEM "Wys Nuts&balk", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Nutsbalk", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Nutsbalk", IDM_VIEW_TOGGLETB
MENUITEM "Pas&maak Nutsbalk...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Wys &Statusbalk", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Wys &Nutsbalk", IDM_VIEW_TOOLBAR
MENUITEM "&HighDPI Nutsbalk", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Nutsbalk", IDM_VIEW_TOGGLETB
MENUITEM "&Pas Nutsbalk...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Wys &Statusbalk", IDM_VIEW_STATUSBAR

4
language/np3_be_by/menu_be_by.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "Ïàë³öà ïðû&ëàäà¢"
BEGIN
MENUITEM "Ïàêàçàöü &ïàë³öó ïðûëàäà¢", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI ïàë³öà ïð&ûëàäà¢", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle ďŕëłöŕ ďđűëŕäŕ˘", IDM_VIEW_TOGGLETB
MENUITEM "&Íàëàäç³öü ïàë³öó ïðûëàäà¢...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Ïàêàçàöü &ðàäîê ñòàíó", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Ïàêàçàöü &ïàë³öó ïðûëàäà¢", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI ïàë³öà ïð&ûëàäà¢", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle ďŕëłöŕ ďđűëŕäŕ˘", IDM_VIEW_TOGGLETB
MENUITEM "&Íàëàäç³öü ïàë³öó ïðûëàäà¢...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Ïàêàçàöü &ðàäîê ñòàíó", IDM_VIEW_STATUSBAR

4
language/np3_de_de/menu_de_de.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Werkzeugleiste"
BEGIN
MENUITEM "Zeige &Werkzeugleiste", IDM_VIEW_TOOLBAR
MENUITEM "&HighDPI Werkzeugleiste", IDM_VIEW_TOGGLETB
MENUITEM "Werkzeugleiste &Umschalten", IDM_VIEW_TOGGLETB
MENUITEM "Werkzeugleiste &anpassen...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Lade andere Toolbar...", IDM_VIEW_LOADTHEMETB
MENUITEM "Zeige &Statusleiste", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Zeige &Werkzeugleiste", IDM_VIEW_TOOLBAR
MENUITEM "&HighDPI Werkzeugleiste", IDM_VIEW_TOGGLETB
MENUITEM "Werkzeugleiste &Umschalten", IDM_VIEW_TOGGLETB
MENUITEM "&Werkzeugleiste anpassen...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Lade andere Toolbar...", IDM_VIEW_LOADTHEMETB
MENUITEM "Zeige &Statusleiste", IDM_VIEW_STATUSBAR

4
language/np3_en_gb/menu_en_gb.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR

8
language/np3_en_us/menu_en_us.rc
View File

@ -339,9 +339,9 @@ BEGIN
END
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomize Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
END
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR

4
language/np3_es_es/menu_es_es.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "Barra de herram&ientas"
BEGIN
MENUITEM "&Mostrar la barra de herramientas", IDM_VIEW_TOOLBAR
MENUITEM "&Barra de herramientas con Iconos grandes", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Personalizar la barra de herramientas...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Cargar tema de la barra de herramientas...", IDM_VIEW_LOADTHEMETB
MENUITEM "Mostrar barra de &estado", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "&Mostrar la barra de herramientas", IDM_VIEW_TOOLBAR
MENUITEM "&Barra de herramientas con Iconos grandes", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Personalizar la barra de herramientas...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Cargar tema de la barra de herramientas...", IDM_VIEW_LOADTHEMETB
MENUITEM "Mostrar la barra de &estado", IDM_VIEW_STATUSBAR

4
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Barre à outils"
BEGIN
MENUITEM "Afficher la &barre à outils", IDM_VIEW_TOOLBAR
MENUITEM "Barre à outils avec grandes Icônes", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "Gérer la barre à outils...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Afficher la barre d'ét&at", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Afficher la barre à ou&tils", IDM_VIEW_TOOLBAR
MENUITEM "Barre à outils avec grandes Icônes", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Gérer la barre à outils...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Afficher la barre d'ét&at", IDM_VIEW_STATUSBAR

4
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR

4
language/np3_it_it/menu_it_it.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR

4
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "ツールバー(&T)"
BEGIN
MENUITEM "ツールバーを表示(&B)", IDM_VIEW_TOOLBAR
MENUITEM "高解像度ツールバー", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "ツールバーの編集(&U)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "ステータスバーを表示(&S)", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "ツールバーの表示(&T)", IDM_VIEW_TOOLBAR
MENUITEM "高解像度ツールバー", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "ツールバーの編集(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "ステータスバーの表示(&S)", IDM_VIEW_STATUSBAR

8
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -340,10 +340,10 @@ BEGIN
POPUP "도구 모음(&T)"
BEGIN
MENUITEM "도구 모음 보기(&B)", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI 도구 모음", IDM_VIEW_TOGGLETB
MENUITEM "도구 모음 사용자 지정(&U)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "상태 표시 줄 보이기(&S)", IDM_VIEW_STATUSBAR
MENUITEM "To&ggle 도구 모음", IDM_VIEW_TOGGLETB
MENUITEM "도구 모음 사용자 지정(&U)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "상태 표시 줄 보이기(&S)", IDM_VIEW_STATUSBAR
END
POPUP "확대/축소(&Z)"
BEGIN

4
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Werkbalk"
BEGIN
MENUITEM "Werk&balk tonen", IDM_VIEW_TOOLBAR
MENUITEM "Grote pictogrammen", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "Werkbal&k aanpassen...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Toon &statusbalk", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Werk&balk tonen", IDM_VIEW_TOOLBAR
MENUITEM "Grote pictogrammen", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Werkbal&k aanpassen...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Toon &statusbalk", IDM_VIEW_STATUSBAR

4
language/np3_pt_br/menu_pt_br.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR

4
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "Панель инстр&ументов"
BEGIN
MENUITEM "Показать &панель инструментов", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI ïàíåëü &èíñòðóìåíòîâ", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle ďŕíĺëü číńňđóěĺíňîâ", IDM_VIEW_TOGGLETB
MENUITEM "&Настроить панель инструментов...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Показать &строку состояния", IDM_VIEW_STATUSBAR
@ -460,7 +460,7 @@ BEGIN
POPUP "+"
BEGIN
MENUITEM "Показать &панель инструментов", IDM_VIEW_TOOLBAR
MENUITEM "HighDPI ïàíåëü &èíñòðóìåíòîâ", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle ďŕíĺëü číńňđóěĺíňîâ", IDM_VIEW_TOGGLETB
MENUITEM "&Настроить панель инструментов...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "Показать &строку состояния", IDM_VIEW_STATUSBAR

6
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -340,7 +340,7 @@ BEGIN
POPUP "묏야으(&T)"
BEGIN
MENUITEM "鞫刻묏야으(&T)", IDM_VIEW_TOOLBAR
MENUITEM "賈痰멕썩驕똑묏야으(&H)", IDM_VIEW_TOGGLETB
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "菱땍屢묏야으(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "鞫刻榴檄으(&S)", IDM_VIEW_STATUSBAR
@ -459,8 +459,8 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "鞫刻묏야으(&T)", IDM_VIEW_TOOLBAR
MENUITEM "賈痰멕썩驕똑묏야으(&H)", IDM_VIEW_TOGGLETB
MENUITEM "鞫刻묏야으(&T)", IDM_VIEW_TOOLBAR
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "菱땍屢묏야으(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB
MENUITEM "鞫刻榴檄으(&S)", IDM_VIEW_STATUSBAR

24
src/Notepad3.c
View File

@ -1796,6 +1796,7 @@ bool SelectExternalToolBar(HWND hwnd)
{
StringCchCopy(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), L""); // clear
StringCchCopy(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapHot), L""); // clear
s_iHighDpiToolBar = 2;
return true;
}
return false;
@ -1818,7 +1819,8 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
// Add Toolbar Bitmap
HBITMAP hbmp = NULL;
HBITMAP hbmpCopy = NULL;
if (StrIsNotEmpty(s_tchToolbarBitmap))
if ((s_iHighDpiToolBar == 2) && StrIsNotEmpty(s_tchToolbarBitmap))
{
hbmp = _LoadBitmapFile(s_tchToolbarBitmap);
@ -1833,14 +1835,14 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
(bmp.bmHeight * NUMTOOLBITMAPS), bmp.bmHeight, NUMTOOLBITMAPS);
StringCchCopy(s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), L"");
s_iHighDpiToolBar = 1;
DeleteObject(hbmp);
hbmp = NULL;
}
}
if (!hbmp) {
LPWSTR toolBarIntRes = (s_iHighDpiToolBar >= 1) ? MAKEINTRESOURCE(IDR_MAINWNDTB2) : MAKEINTRESOURCE(IDR_MAINWNDTB);
LPWSTR toolBarIntRes = (s_iHighDpiToolBar == 0) ? MAKEINTRESOURCE(IDR_MAINWNDTB) : MAKEINTRESOURCE(IDR_MAINWNDTB2);
hbmp = LoadImage(hInstance, toolBarIntRes, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
}
@ -2997,8 +2999,6 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu,IDM_VIEW_NOSAVEFINDREPL,i);
EnableCmd(hmenu,IDM_VIEW_SAVESETTINGS,s_bEnableSaveSettings && i);
CheckCmd(hmenu, IDM_VIEW_TOGGLETB, ((s_iHighDpiToolBar >= 1) && StrIsEmpty(s_tchToolbarBitmap)));
i = (StringCchLenW(Globals.IniFile,COUNTOF(Globals.IniFile)) > 0 || StringCchLenW(s_wchIniFile2,COUNTOF(s_wchIniFile2)) > 0);
EnableCmd(hmenu,IDM_VIEW_SAVESETTINGSNOW,s_bEnableSaveSettings && i);
@ -4943,12 +4943,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case IDM_VIEW_TOGGLETB:
s_iHighDpiToolBar = (s_iHighDpiToolBar <= 0) ? 1 : 0;
if (s_iHighDpiToolBar >= 0) {
StringCchCopy(s_tchToolbarBitmap, COUNTOF(s_tchToolbarBitmap), L"");
StringCchCopy(s_tchToolbarBitmapHot, COUNTOF(s_tchToolbarBitmapHot), L"");
StringCchCopy(s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmapDisabled), L"");
}
s_iHighDpiToolBar = (s_iHighDpiToolBar + 1) % (StrIsEmpty(s_tchToolbarBitmap) ? 2 : 3);
SendMessage(hwnd, WM_THEMECHANGED, 0, 0);
break;
@ -7093,8 +7088,8 @@ void LoadSettings()
WCHAR tchHighDpiToolBar[32] = { L'\0' };
StringCchPrintf(tchHighDpiToolBar, COUNTOF(tchHighDpiToolBar), L"%ix%i HighDpiToolBar", ResX, ResY);
s_iHighDpiToolBar = IniSectionGetInt(pIniSection, tchHighDpiToolBar, 0);
s_iHighDpiToolBar = clampi(s_iHighDpiToolBar, -1, 1);
s_iHighDpiToolBar = IniSectionGetInt(pIniSection, tchHighDpiToolBar, -1);
s_iHighDpiToolBar = StrIsNotEmpty(s_tchToolbarBitmap) ? 2 : clampi(s_iHighDpiToolBar, -1, 1);
if (s_iHighDpiToolBar < 0) { // undefined: determine high DPI (higher than Full-HD)
s_iHighDpiToolBar = IsFullHDOrHigher(ResX, ResY) ? 1 : 0;
}
@ -8988,7 +8983,7 @@ void UpdateSettingsCmds()
CheckCmd(hmenu, IDM_VIEW_SAVESETTINGS, Settings.SaveSettings && s_bEnableSaveSettings);
EnableCmd(hmenu, IDM_VIEW_SAVESETTINGS, hasIniFile && s_bEnableSaveSettings);
EnableCmd(hmenu, IDM_VIEW_SAVESETTINGSNOW, hasIniFile && s_bEnableSaveSettings);
if (SciCall_GetZoom() != 100) { ShowZoomCallTip(); }
COND_SHOW_ZOOM_CALLTIP();
}
@ -9005,6 +9000,7 @@ void UpdateUI()
scn.updated = (SC_UPDATE_CONTENT | SC_UPDATE_NP3_INTERNAL_NOTIFY);
SendMessage(Globals.hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn);
//PostMessage(Globals.hwndMain, WM_NOTIFY, IDC_EDIT, (LPARAM)&scn);
COND_SHOW_ZOOM_CALLTIP();
}

1
src/Notepad3.h
View File

@ -194,6 +194,7 @@ bool CheckNotifyChangeEvent();
#define _IGNORE_NOTIFY_CHANGE_ __try { IgnoreNotifyChangeEvent();
#define _OBSERVE_NOTIFY_CHANGE_ } __finally { ObserveNotifyChangeEvent(); }
#define COND_SHOW_ZOOM_CALLTIP() { if (SciCall_GetZoom() != 100) { ShowZoomCallTip(); } }
#endif //_NP3_NOTEPAD3_H_
/// End of Notepad3.h ///