github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[UPDATE] line numbers margin width is changed dynamically according to the needed space (but keeping at least 3 digits). 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@450 f5eea248-9336-0410-98b8-ebc06183d4e3
pull/343/head^2
yniq 2009-04-13 08:35:56 +00:00
parent 6ed92acab2
commit 1175b82052
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -2600,7 +2600,6 @@ BOOL Notepad_plus::notify(SCNotification *notification)
break; break;
case SCN_ZOOM: case SCN_ZOOM:
notifyView->setLineNumberWidth(notifyView->hasMarginShowed(ScintillaEditView::_SC_MARGE_LINENUMBER));
break; break;
case SCN_MACRORECORD: case SCN_MACRORECORD:
@ -2609,6 +2608,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
case SCN_PAINTED: case SCN_PAINTED:
{ {
notifyView->updateLineNumberWidth();
if (_syncInfo.doSync()) if (_syncInfo.doSync())
doSynScorll(HWND(notification->nmhdr.hwndFrom)); doSynScorll(HWND(notification->nmhdr.hwndFrom));

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

@ -32,8 +32,6 @@ const int ScintillaEditView::_SC_MARGE_SYBOLE = 1;
const int ScintillaEditView::_SC_MARGE_FOLDER = 2; const int ScintillaEditView::_SC_MARGE_FOLDER = 2;
const int ScintillaEditView::_SC_MARGE_MODIFMARKER = 3; const int ScintillaEditView::_SC_MARGE_MODIFMARKER = 3;
const int ScintillaEditView::_MARGE_LINENUMBER_NB_CHIFFRE = 5;
WNDPROC ScintillaEditView::_scintillaDefaultProc = NULL; WNDPROC ScintillaEditView::_scintillaDefaultProc = NULL;
/* /*
SC_MARKNUM_* | Arrow Plus/minus Circle tree Box tree SC_MARKNUM_* | Arrow Plus/minus Circle tree Box tree
@ -1394,9 +1392,6 @@ void ScintillaEditView::activateBuffer(BufferID buffer)
itoa(numLines, numLineStr, 10); itoa(numLines, numLineStr, 10);
int nbDigit = strlen(numLineStr); int nbDigit = strlen(numLineStr);
if (increaseMaxNbDigit(nbDigit))
setLineNumberWidth(hasMarginShowed(ScintillaEditView::_SC_MARGE_LINENUMBER));
runMarkers(true, 0, true, false); runMarkers(true, 0, true, false);
return; //all done return; //all done
} }

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

@ -149,7 +149,7 @@ class ScintillaEditView : public Window
public: public:
ScintillaEditView() ScintillaEditView()
: Window(), _pScintillaFunc(NULL),_pScintillaPtr(NULL), : Window(), _pScintillaFunc(NULL),_pScintillaPtr(NULL),
_folderStyle(FOLDER_STYLE_BOX), _maxNbDigit(_MARGE_LINENUMBER_NB_CHIFFRE), _wrapRestoreNeeded(false) _folderStyle(FOLDER_STYLE_BOX), _lineNumbersShown(false), _wrapRestoreNeeded(false)
{ {
++_refCount; ++_refCount;
}; };
@ -247,11 +247,9 @@ 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;
static const int _MARGE_LINENUMBER_NB_CHIFFRE;
void showMargin(int whichMarge, bool willBeShowed = true) { void showMargin(int whichMarge, bool willBeShowed = true) {
if (whichMarge == _SC_MARGE_LINENUMBER) if (whichMarge == _SC_MARGE_LINENUMBER)
setLineNumberWidth(willBeShowed); showLineNumbersMargin(willBeShowed);
else else
{ {
int width = 3; int width = 3;
@ -380,10 +378,40 @@ public:
void setLineIndent(int line, int indent) const; void setLineIndent(int line, int indent) const;
void setLineNumberWidth(bool willBeShowed = true) { void showLineNumbersMargin(bool show){
// The 4 here allows for spacing: 1 poxel on left and 3 on right. if (show == _lineNumbersShown) return;
int pixelWidth = int((willBeShowed)?(8 + _maxNbDigit * execute(SCI_TEXTWIDTH, STYLE_LINENUMBER, (LPARAM)"8")):0); _lineNumbersShown = show;
execute(SCI_SETMARGINWIDTHN, 0, pixelWidth); if (show)
{
updateLineNumberWidth();
}
else
{
execute(SCI_SETMARGINWIDTHN, _SC_MARGE_LINENUMBER, 0);
}
}
void updateLineNumberWidth() {
if (_lineNumbersShown)
{
int linesVisible = (int) execute(SCI_LINESONSCREEN);
if (linesVisible)
{
int firstVisibleLineVis = (int) execute(SCI_GETFIRSTVISIBLELINE);
int lastVisibleLineVis = linesVisible + firstVisibleLineVis + 1;
int i = 0;
while (lastVisibleLineVis)
{
lastVisibleLineVis /= 10;
i++;
}
i = max(i, 3);
{
int pixelWidth = int(8 + i * execute(SCI_TEXTWIDTH, STYLE_LINENUMBER, (LPARAM)"8"));
execute(SCI_SETMARGINWIDTHN, _SC_MARGE_LINENUMBER, pixelWidth);
}
}
}
}; };
void setCurrentLineHiLiting(bool isHiliting, COLORREF bgColor) const { void setCurrentLineHiLiting(bool isHiliting, COLORREF bgColor) const {
@ -448,15 +476,6 @@ public:
void foldCurrentPos(bool mode); void foldCurrentPos(bool mode);
int getCodepage() const {return _codepage;}; int getCodepage() const {return _codepage;};
bool increaseMaxNbDigit(int newValue) {
if (newValue > _maxNbDigit)
{
_maxNbDigit = newValue;
return true;
}
return false;
};
NppParameters * getParameter() { NppParameters * getParameter() {
return _pParameter; return _pParameter;
}; };
@ -579,7 +598,7 @@ protected:
int _codepage; int _codepage;
int _oemCodepage; int _oemCodepage;
int _maxNbDigit; // For Line Number Marge bool _lineNumbersShown;
bool _wrapRestoreNeeded; bool _wrapRestoreNeeded;