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

+ fix: reset scroll width on font (size) changes (automatically adapted)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-03-22 19:57:10 +01:00
parent 76ebeea364
commit ca3f8a07ca
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Edit.c
View File

@ -268,7 +268,7 @@ void EditSetNewText(HWND hwnd,char* lpstrText,DWORD cbText)
UndoRedoActionMap(-1,NULL);
SendMessage(hwnd,SCI_CLEARALL,0,0);
SendMessage(hwnd,SCI_MARKERDELETEALL,(WPARAM)MARKER_NP3_BOOKMARK,0);
SendMessage(hwnd,SCI_SETSCROLLWIDTH, DEFAULT_SCROLL_WIDTH,0);
SendMessage(hwnd,SCI_SETSCROLLWIDTH, 1,0);
SendMessage(hwnd,SCI_SETXOFFSET,0,0);
FileVars_Apply(hwnd,&fvCurFile);

4
src/Edit.h
View File

@ -51,10 +51,6 @@ typedef struct _editfindreplace
#define INDIC_NP3_MATCH_BRACE 2
#define INDIC_NP3_BAD_BRACE 3
// [pixel] auto calculate by SCI_SETSCROLLWIDTHTRACKING
//#define DEFAULT_SCROLL_WIDTH (8*80)
#define DEFAULT_SCROLL_WIDTH ((8*g_WinInfo.cx)/10)
void EditInitWordDelimiter(HWND);
void EditSetNewText(HWND,char*,DWORD);
BOOL EditConvertText(HWND,int,int,BOOL);

4
src/Notepad3.c
View File

@ -1228,7 +1228,7 @@ void __fastcall InitializeSciEditCtrl(HWND hwndEditCtrl)
SendMessage(hwndEditCtrl, SCI_SETPASTECONVERTENDINGS, TRUE, 0);
SendMessage(hwndEditCtrl, SCI_SETMODEVENTMASK,/*SC_MODEVENTMASKALL*/SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT | SC_MOD_CONTAINER, 0);
SendMessage(hwndEditCtrl, SCI_USEPOPUP, FALSE, 0);
SendMessage(hwndEditCtrl, SCI_SETSCROLLWIDTH, DEFAULT_SCROLL_WIDTH, 0);
SendMessage(hwndEditCtrl, SCI_SETSCROLLWIDTH, 1, 0);
SendMessage(hwndEditCtrl, SCI_SETSCROLLWIDTHTRACKING, TRUE, 0);
SendMessage(hwndEditCtrl, SCI_SETENDATLASTLINE, TRUE, 0);
SendMessage(hwndEditCtrl, SCI_SETMOUSESELECTIONRECTANGULARSWITCH, TRUE, 0);
@ -5612,7 +5612,7 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
case SCN_SAVEPOINTREACHED:
SendMessage(g_hwndEdit, SCI_SETSCROLLWIDTH, DEFAULT_SCROLL_WIDTH, 0);
SendMessage(g_hwndEdit, SCI_SETSCROLLWIDTH, 1, 0);
SetDocumentModified(FALSE);
break;

3
src/Styles.c
View File

@ -5468,6 +5468,9 @@ void Style_SetStyles(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
if (lstrlen(lpszStyle) == 0) { return; }
// reset horizontal scrollbar width
SendMessage(hwnd, SCI_SETSCROLLWIDTH, 1, 0);
// Font
if (Style_StrGetFont(lpszStyle, tch, COUNTOF(tch))) {
if (lstrlen(tch) > 0) {