tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-24 14:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Print Line Number" preference is ignored for printing regression

Browse Source 
Fix #9379
This commit is contained in:
Don HO 2021-01-10 04:07:13 +01:00
parent d5ad02521e
commit 38f6319f4e
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -2479,6 +2479,24 @@ void ScintillaEditView::beginOrEndSelect()
} }
} }
void ScintillaEditView::showMargin(int whichMarge, bool willBeShowed)
{
if (whichMarge == _SC_MARGE_LINENUMBER)
{
bool forcedToHide = !willBeShowed;
updateLineNumbersMargin(forcedToHide);
}
else
{
int width = 3;
if (whichMarge == _SC_MARGE_SYBOLE)
width = NppParameters::getInstance()._dpiManager.scaleX(100) >= 150 ? 20 : 16;
else if (whichMarge == _SC_MARGE_FOLDER)
width = NppParameters::getInstance()._dpiManager.scaleX(100) >= 150 ? 18 : 14;
execute(SCI_SETMARGINWIDTHN, whichMarge, willBeShowed ? width : 0);
}
}
void ScintillaEditView::updateBeginEndSelectPosition(bool is_insert, size_t position, size_t length) void ScintillaEditView::updateBeginEndSelectPosition(bool is_insert, size_t position, size_t length)
{ {
if (_beginSelectPosition != -1 && static_cast<long long>(position) < _beginSelectPosition - 1) if (_beginSelectPosition != -1 && static_cast<long long>(position) < _beginSelectPosition - 1)

22
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -324,19 +324,7 @@ public:
static const int _SC_MARGE_FOLDER; static const int _SC_MARGE_FOLDER;
//static const int _SC_MARGE_MODIFMARKER; //static const int _SC_MARGE_MODIFMARKER;
void showMargin(int whichMarge, bool willBeShowed = true) { void showMargin(int whichMarge, bool willBeShowed = true);
if (whichMarge == _SC_MARGE_LINENUMBER)
updateLineNumbersMargin();
else
{
int width = 3;
if (whichMarge == _SC_MARGE_SYBOLE)
width = NppParameters::getInstance()._dpiManager.scaleX(100) >= 150 ? 20 : 16;
else if (whichMarge == _SC_MARGE_FOLDER)
width = NppParameters::getInstance()._dpiManager.scaleX(100) >= 150 ? 18 : 14;
execute(SCI_SETMARGINWIDTHN, whichMarge, willBeShowed ? width : 0);
}
};
bool hasMarginShowed(int witchMarge) { bool hasMarginShowed(int witchMarge) {
return (execute(SCI_GETMARGINWIDTHN, witchMarge, 0) != 0); return (execute(SCI_GETMARGINWIDTHN, witchMarge, 0) != 0);
@ -473,9 +461,13 @@ public:
void setLineIndent(int line, int indent) const; void setLineIndent(int line, int indent) const;
void updateLineNumbersMargin() { void updateLineNumbersMargin(bool forcedToHide) {
const ScintillaViewParams& svp = NppParameters::getInstance().getSVP(); const ScintillaViewParams& svp = NppParameters::getInstance().getSVP();
if (svp._lineNumberMarginShow) if (forcedToHide)
{
execute(SCI_SETMARGINWIDTHN, _SC_MARGE_LINENUMBER, 0);
}
else if (svp._lineNumberMarginShow)
{ {
updateLineNumberWidth(); updateLineNumberWidth();
} }