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

Dark mode tweaks and unicode size support for InSelection configurable size 

Followup PR to #14175

Addresses

* https://github.com/notepad-plus-plus/notepad-plus-plus/pull/14175#issuecomment-1751439227

and

* 591b00e538 (commitcomment-129354863)

Close #14217
This commit is contained in:
Alan Kilborn 2023-10-07 08:16:45 -04:00 committed by Don Ho
parent 591b00e538
commit b3179b5ccb
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -1493,7 +1493,7 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE) if (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE)
{ {
Sci_CharacterRangeFull cr = (*_ppEditView)->getSelection(); Sci_CharacterRangeFull cr = (*_ppEditView)->getSelection();
intptr_t nbSelected = cr.cpMax - cr.cpMin; intptr_t nbSelected = (*_ppEditView)->execute(SCI_COUNTCHARACTERS, cr.cpMin, cr.cpMax);
bool inSelEnabled = nbSelected != 0; bool inSelEnabled = nbSelected != 0;

3
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -247,6 +247,8 @@ intptr_t CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
NppDarkMode::setDarkTooltips(_delimiterSubDlg._tip, NppDarkMode::ToolTipsType::tooltip); NppDarkMode::setDarkTooltips(_delimiterSubDlg._tip, NppDarkMode::ToolTipsType::tooltip);
if (_performanceSubDlg._largeFileRestrictionTip != nullptr) if (_performanceSubDlg._largeFileRestrictionTip != nullptr)
NppDarkMode::setDarkTooltips(_performanceSubDlg._largeFileRestrictionTip, NppDarkMode::ToolTipsType::tooltip); NppDarkMode::setDarkTooltips(_performanceSubDlg._largeFileRestrictionTip, NppDarkMode::ToolTipsType::tooltip);
if (_searchingSubDlg._tipInSelThresh != nullptr)
NppDarkMode::setDarkTooltips(_searchingSubDlg._tipInSelThresh, NppDarkMode::ToolTipsType::tooltip);
// groupbox label in dark mode support disabled text color // groupbox label in dark mode support disabled text color
if (NppDarkMode::isEnabled()) if (NppDarkMode::isEnabled())
@ -5595,6 +5597,7 @@ intptr_t CALLBACK SearchingSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
case WM_CTLCOLORDLG: case WM_CTLCOLORDLG:
case WM_CTLCOLORSTATIC: case WM_CTLCOLORSTATIC:
case WM_CTLCOLOREDIT:
{ {
return NppDarkMode::onCtlColorDarker(reinterpret_cast<HDC>(wParam)); return NppDarkMode::onCtlColorDarker(reinterpret_cast<HDC>(wParam));
} }

1
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -176,6 +176,7 @@ private :
class SearchingSubDlg : public StaticDialog class SearchingSubDlg : public StaticDialog
{ {
friend class PreferenceDlg;
public: public:
SearchingSubDlg() = default; SearchingSubDlg() = default;
~SearchingSubDlg() { ~SearchingSubDlg() {