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 branch 'Dev_RC_fixes' into Dev_AccelKeys

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-10-16 15:06:45 +02:00
commit 5ce23bb72f
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Notepad3.c
View File

@ -6867,13 +6867,13 @@ void LoadSettings()
GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_IMEASURE, localeInfo, 3);
LONG const _margin = (localeInfo[0] == L'0') ? 2000L : 1000L; // Metric system. L'1' is US System
Defaults.PrintMargin.left = _margin;
Settings.PrintMargin.left = clampi(IniSectionGetInt(pIniSection, L"PrintMarginLeft", Defaults.PrintMargin.left), _margin, 40000);
Settings.PrintMargin.left = clampi(IniSectionGetInt(pIniSection, L"PrintMarginLeft", Defaults.PrintMargin.left), 0, 40000);
Defaults.PrintMargin.top = _margin;
Settings.PrintMargin.top = clampi(IniSectionGetInt(pIniSection, L"PrintMarginTop", Defaults.PrintMargin.top), _margin, 40000);
Settings.PrintMargin.top = clampi(IniSectionGetInt(pIniSection, L"PrintMarginTop", Defaults.PrintMargin.top), 0, 40000);
Defaults.PrintMargin.right = _margin;
Settings.PrintMargin.right = clampi(IniSectionGetInt(pIniSection, L"PrintMarginRight", Defaults.PrintMargin.right), _margin, 40000);
Settings.PrintMargin.right = clampi(IniSectionGetInt(pIniSection, L"PrintMarginRight", Defaults.PrintMargin.right), 0, 40000);
Defaults.PrintMargin.bottom = _margin;
Settings.PrintMargin.bottom = clampi(IniSectionGetInt(pIniSection, L"PrintMarginBottom", Defaults.PrintMargin.bottom), _margin, 40000);
Settings.PrintMargin.bottom = clampi(IniSectionGetInt(pIniSection, L"PrintMarginBottom", Defaults.PrintMargin.bottom), 0, 40000);
GET_BOOL_VALUE_FROM_INISECTION(SaveBeforeRunningTools, false);
GET_INT_VALUE_FROM_INISECTION(FileWatchingMode, 0, 0, 2);

20
src/Print.cpp
View File

@ -517,7 +517,6 @@ extern "C" UINT_PTR CALLBACK PageSetupHook(HWND hwnd, UINT uiMsg, WPARAM wParam,
int const iZoom = (int)SendDlgItemMessage(hwnd,31,UDM_GETPOS32,0,(LPARAM)&bError);
Settings.PrintZoom = bError ? 100 : iZoom;
int const iFontSize = (int)SendDlgItemMessage(hwnd, 41, UDM_GETPOS32, 0, (LPARAM)&bError);
Settings.PrintFontSize = bError ? 10 : iFontSize;
Settings.PrintHeader = (int)SendDlgItemMessage(hwnd, 32, CB_GETCURSEL, 0, 0);
Settings.PrintFooter = (int)SendDlgItemMessage(hwnd, 33, CB_GETCURSEL, 0, 0);
Settings.PrintColorMode = (int)SendDlgItemMessage(hwnd, 34, CB_GETCURSEL, 0, 0);
@ -584,23 +583,12 @@ extern "C" void EditPrintSetup(HWND hwnd)
//
static void EditPrintInit()
{
if (Settings.PrintMargin.left == -1 || Settings.PrintMargin.top == -1 ||
Settings.PrintMargin.right == -1 || Settings.PrintMargin.bottom == -1)
{
if (Settings.PrintMargin.left <= -1 || Settings.PrintMargin.top <= -1 ||
Settings.PrintMargin.right <= -1 || Settings.PrintMargin.bottom <= -1) {
WCHAR localeInfo[3];
GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_IMEASURE, localeInfo, 3);
if (localeInfo[0] == L'0') { // Metric system. L'1' is US System
Settings.PrintMargin.left = 2000;
Settings.PrintMargin.top = 2000;
Settings.PrintMargin.right = 2000;
Settings.PrintMargin.bottom = 2000;
}
else {
Settings.PrintMargin.left = 1000;
Settings.PrintMargin.top = 1000;
Settings.PrintMargin.right = 1000;
Settings.PrintMargin.bottom = 1000; }
LONG const _margin = (localeInfo[0] == L'0') ? 2000L : 1000L; // Metric system. L'1' is US System
Settings.PrintMargin = { _margin, _margin, _margin, _margin };
}
}

1
src/TypeDefs.h
View File

@ -310,7 +310,6 @@ typedef struct _settings_t
int PrintFooter;
int PrintColorMode;
int PrintZoom;
int PrintFontSize;
bool SaveBeforeRunningTools;
int FileWatchingMode;
bool ResetFileWatching;