CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ versin info update

Browse Source
This commit is contained in:
Rainer Kottenhoff 2020-06-12 21:27:16 +02:00
parent 7037c60f4c
commit daa48b1c69
9 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/day.txt
View File

@ -1 +1 @@
611
612

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.611.1"
version="5.20.612.1"
type="win32"
/>
<description>Notepad3 BETA</description>

6
scintilla/include/Platform.h
View File

@ -481,12 +481,12 @@ protected:
WindowID wid;
public:
Window() noexcept : wid(nullptr), cursorLast(cursorInvalid) {}
Window() noexcept : wid(nullptr), cursorLast(Cursor::cursorInvalid) {}
Window(const Window &source) = delete;
Window(Window &&) = delete;
Window &operator=(WindowID wid_) noexcept {
wid = wid_;
cursorLast = cursorInvalid;
cursorLast = Cursor::cursorInvalid;
return *this;
}
Window &operator=(const Window &) = delete;
@ -507,7 +507,7 @@ public:
void InvalidateAll() noexcept;
void SCICALL InvalidateRectangle(PRectangle rc) noexcept;
virtual void SetFont(const Font &font) noexcept;
enum Cursor {
enum class Cursor {
cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand
};
void SetCursor(Cursor curs) noexcept;

20
scintilla/src/Editor.cxx
View File

@ -3949,7 +3949,7 @@ int Editor::KeyDownWithModifiers(int key, int modifiers, bool *consumed) {
DwellEnd(false);
// >>>>>>>>>>>>>>> BEG NON STD SCI PATCH >>>>>>>>>>>>>>>
if (hoverIndicatorPos != Sci::invalidPosition)
if (modifiers & (SCI_ALT | SCI_CTRL)) { DisplayCursor(Window::cursorHand); }
if (modifiers & (SCI_ALT | SCI_CTRL)) { DisplayCursor(Window::Cursor::cursorHand); }
// <<<<<<<<<<<<<<< END NON STD SCI PATCH <<<<<<<<<<<<<<<
const int msg = kmap.Find(key, modifiers);
if (msg) {
@ -4432,7 +4432,7 @@ Window::Cursor Editor::GetMarginCursor(Point pt) const noexcept {
return static_cast<Window::Cursor>(m.cursor);
x += m.width;
}
return Window::cursorReverseArrow;
return Window::Cursor::cursorReverseArrow;
}
void Editor::TrimAndSetSelection(Sci::Position currentPos_, Sci::Position anchor_) {
@ -4526,7 +4526,7 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifie
SetHoverIndicatorPoint(pt);
// >>>>>>>>>>>>>>> BEG NON STD SCI PATCH >>>>>>>>>>>>>>>
if (hoverIndicatorPos != Sci::invalidPosition)
if (modifiers & (SCI_ALT | SCI_CTRL)) { DisplayCursor(Window::cursorHand); }
if (modifiers & (SCI_ALT | SCI_CTRL)) { DisplayCursor(Window::Cursor::cursorHand); }
// <<<<<<<<<<<<<<< END NON STD SCI PATCH <<<<<<<<<<<<<<<
//Platform::DebugPrintf("ButtonDown %d %d = %d alt=%d %d\n", curTime, lastClickTime, curTime - lastClickTime, alt, inDragDrop);
ptMouseLast = pt;
@ -4873,7 +4873,7 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt, true, true) != hotSpotClickPos) {
if (inDragDrop == ddNone) {
DisplayCursor(Window::cursorText);
DisplayCursor(Window::Cursor::cursorText);
}
hotSpotClickPos = INVALID_POSITION;
}
@ -4888,18 +4888,18 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
}
// Display regular (drag) cursor over selection
if (PointInSelection(pt) && !SelectionEmpty()) {
DisplayCursor(Window::cursorArrow);
DisplayCursor(Window::Cursor::cursorArrow);
} else {
SetHoverIndicatorPoint(pt);
if (PointIsHotspot(pt)) {
DisplayCursor(Window::cursorHand);
DisplayCursor(Window::Cursor::cursorHand);
SetHotSpotRange(&pt);
} else {
// >>>>>>>>>>>>>>> BEG NON STD SCI PATCH >>>>>>>>>>>>>>>
if (hoverIndicatorPos != Sci::invalidPosition)
if (modifiers & (SCI_ALT | SCI_CTRL)) { DisplayCursor(Window::cursorHand); }
if (modifiers & (SCI_ALT | SCI_CTRL)) { DisplayCursor(Window::Cursor::cursorHand); }
else
DisplayCursor(Window::cursorText);
DisplayCursor(Window::Cursor::cursorText);
// <<<<<<<<<<<<<<< END NON STD SCI PATCH <<<<<<<<<<<<<<<
SetHotSpotRange(nullptr);
}
@ -4930,7 +4930,7 @@ void Editor::ButtonUpWithModifiers(Point pt, unsigned int curTime, int modifiers
if (PointInSelMargin(pt)) {
DisplayCursor(GetMarginCursor(pt));
} else {
DisplayCursor(Window::cursorText);
DisplayCursor(Window::Cursor::cursorText);
SetHotSpotRange(nullptr);
}
ptMouseLast = pt;
@ -7919,7 +7919,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
case SCI_SETCURSOR:
cursorMode = static_cast<int>(wParam);
DisplayCursor(Window::cursorText);
DisplayCursor(Window::Cursor::cursorText);
break;
case SCI_GETCURSOR:

18
scintilla/win32/PlatWin.cxx
View File

@ -2477,27 +2477,27 @@ HCURSOR LoadReverseArrowCursor(DPI_T dpi) noexcept {
void Window::SetCursor(Cursor curs) noexcept {
switch (curs) {
case cursorText:
case Cursor::cursorText:
::SetCursor(::LoadCursor({}, IDC_IBEAM));
break;
case cursorUp:
case Cursor::cursorUp:
::SetCursor(::LoadCursor({}, IDC_UPARROW));
break;
case cursorWait:
case Cursor::cursorWait:
::SetCursor(::LoadCursor({}, IDC_WAIT));
break;
case cursorHoriz:
case Cursor::cursorHoriz:
::SetCursor(::LoadCursor({}, IDC_SIZEWE));
break;
case cursorVert:
case Cursor::cursorVert:
::SetCursor(::LoadCursor({}, IDC_SIZENS));
break;
case cursorHand:
case Cursor::cursorHand:
::SetCursor(::LoadCursor({}, IDC_HAND));
break;
case cursorReverseArrow:
case cursorArrow:
case cursorInvalid: // Should not occur, but just in case.
case Cursor::cursorReverseArrow:
case Cursor::cursorArrow:
case Cursor::cursorInvalid: // Should not occur, but just in case.
::SetCursor(::LoadCursor({}, IDC_ARROW));
break;
}

4
scintilla/win32/PlatWin.h
View File

@ -57,10 +57,6 @@ BOOL DpiAdjustWindowRect(LPRECT lpRect, DWORD dwStyle, DWORD dwExStyle, unsigned
namespace Scintilla {
#ifndef USER_DEFAULT_SCREEN_DPI
#define USER_DEFAULT_SCREEN_DPI 96
#endif
extern void Platform_Initialise(void *hInstance) noexcept;
extern void Platform_Finalise(bool fromDllMain) noexcept;

10
scintilla/win32/ScintillaWin.cxx
View File

@ -865,7 +865,7 @@ void ScintillaWin::DisplayCursor(Window::Cursor c) noexcept {
if (cursorMode != SC_CURSORNORMAL) {
c = static_cast<Window::Cursor>(cursorMode);
}
if (c == Window::cursorReverseArrow) {
if (c == Window::Cursor::cursorReverseArrow) {
::SetCursor(reverseArrowCursor.Load(dpi));
} else {
wMain.SetCursor(c);
@ -1562,7 +1562,7 @@ sptr_t ScintillaWin::GetText(uptr_t wParam, sptr_t lParam) const {
Window::Cursor ScintillaWin::ContextCursor() {
if (inDragDrop == ddDragging) {
return Window::cursorUp;
return Window::Cursor::cursorUp;
} else {
// Display regular (drag) cursor over selection
POINT pt;
@ -1571,13 +1571,13 @@ Window::Cursor ScintillaWin::ContextCursor() {
if (PointInSelMargin(PointFromPOINT(pt))) {
return GetMarginCursor(PointFromPOINT(pt));
} else if (PointInSelection(PointFromPOINT(pt)) && !SelectionEmpty()) {
return Window::cursorArrow;
return Window::Cursor::cursorArrow;
} else if (PointIsHotspot(PointFromPOINT(pt))) {
return Window::cursorHand;
return Window::Cursor::cursorHand;
}
}
}
return Window::cursorText;
return Window::Cursor::cursorText;
}
#if SCI_EnablePopupMenu

14
src/Dialogs.c
View File

@ -852,24 +852,24 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
break;
}
}
StringCchPrintf(wchBuf2, ARRAYSIZE(wchBuf2), L"\n- Locale: %s (CP:'%s')",
StringCchPrintf(wchBuf2, ARRAYSIZE(wchBuf2), L"\n- Locale -> %s (CP:'%s')",
wchBuf, g_Encodings[CPI_ANSI_DEFAULT].wchLabel);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf2);
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Current Encoding = '%s'", Encoding_GetLabel(Encoding_Current(CPI_GET)));
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Current Encoding -> '%s'", Encoding_GetLabel(Encoding_Current(CPI_GET)));
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf);
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Screen-Resolution = %i x %i [pix]", ResX, ResY);
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Screen-Resolution -> %i x %i [pix]", ResX, ResY);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf);
DPI_T dpi = Scintilla_GetCurrentDPI(hwnd);
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Display-DPI = %i x %i (Scale: %i%%).", dpi.x, dpi.y, ScaleIntToDPI_X(hwnd, 100));
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Display-DPI -> %i x %i (Scale: %i%%).", dpi.x, dpi.y, ScaleIntToDPI_X(hwnd, 100));
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf);
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Rendering-Technology = '%s'", Settings.RenderingTechnology ? L"DIRECT-WRITE" : L"GDI");
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Rendering-Technology -> '%s'", Settings.RenderingTechnology ? L"DIRECT-WRITE" : L"GDI");
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf);
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Zoom = %i%%.", SciCall_GetZoom());
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"\n- Zoom -> %i%%.", SciCall_GetZoom());
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), (IsProcessElevated() ?
@ -880,7 +880,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
L"\n- User is not in Admin-Group"));
Style_GetLexerDisplayName(Style_GetCurrentLexerPtr(), wchBuf, COUNTOF(wchBuf));
StringCchPrintf(wchBuf2, ARRAYSIZE(wchBuf2), L"\n- Current Lexer: '%s'", wchBuf);
StringCchPrintf(wchBuf2, ARRAYSIZE(wchBuf2), L"\n- Current Lexer -> '%s'", wchBuf);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), wchBuf2);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n");

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 611
#define VERSION_REV 612
#define VERSION_BUILD 1
#define SCINTILLA_VER 443
#define ONIGURUMA_REGEX_VER 6.9.5