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

Fix a typo; Make a function name & comment more accurate

pull/15508/head
Don Ho 2024-07-23 12:31:50 +02:00
parent bfe27cc860
commit 6556b17ee2
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/bin/change.log
View File

@ -6,7 +6,7 @@ Notepad++ v8.6.9 bug-fixes & new enhancements:
4. Fix the regression where the Find dialog size is not remembered across sessions.
5. Fix the regression of content lost by using Encoding "Convert to..." commands.
6. Fix the regression of exception/crash on Windows Server Core 2022.
7. Prevent DirectWrite from being enabled under Windows Sever.
7. Prevent DirectWrite from being enabled under Windows Server.
8. Enhance the quality of Fluent toolbar icon sets for different DPI settings.
9. Improve the look & feel of tabbar close button in dark mode.
10. Improve the dark mode tab bar icon in the search results panel.

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -6323,7 +6323,7 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session, bool includUntitledD
sessionFileInfo sfi(buf->getFullPathName(), langName, buf->getEncoding(), buf->getUserReadOnly(), buf->getPosition(editView), buf->getBackupFileName().c_str(), buf->getLastModifiedTimestamp(), buf->getMapPosition());
sfi._isMonitoring = buf->isMonitoringOn();
sfi._individualTabColour = docTab[k]->getIndividualTabColour(static_cast<int>(i));
sfi._individualTabColour = docTab[k]->getIndividualTabColourId(static_cast<int>(i));
sfi._isRTL = buf->isRTL();
_invisibleEditView.execute(SCI_SETDOCPOINTER, 0, buf->getDocument());

4
PowerEditor/src/NppBigSwitch.cpp
View File

@ -2693,7 +2693,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
_isAttemptingCloseOnQuit = false;
if (nppgui._rememberLastSession)
_lastRecentFileList.setLock(false); //only lock when the session is remembered
_lastRecentFileList.setLock(false); //only unlock when the session is remembered
if (!saveProjectPanelsParams()) allClosed = false; //writeProjectPanelsSettings
saveFileBrowserParam();
@ -3122,7 +3122,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
if ((tabIndex >= 0) && (tabIndex < static_cast<int>(pDt->nbItem())))
{
colorId = pDt->getIndividualTabColour(tabIndex);
colorId = pDt->getIndividualTabColourId(tabIndex);
}
return colorId;

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

@ -96,7 +96,7 @@ void DocTabView::setIndividualTabColour(BufferID bufferId, int colorId)
bufferId->setDocColorId(colorId);
}
int DocTabView::getIndividualTabColour(int tabIndex)
int DocTabView::getIndividualTabColourId(int tabIndex)
{
BufferID bufferId = getBufferByIndex(tabIndex);
return bufferId->getDocColorId();

2
PowerEditor/src/ScintillaComponent/DocTabView.h
View File

@ -92,7 +92,7 @@ public :
};
void setIndividualTabColour(BufferID bufferId, int colorId);
int getIndividualTabColour(int tabIndex) override;
int getIndividualTabColourId(int tabIndex) override;
HIMAGELIST getImgLst(UINT index) {
if (index >= _pIconListVector.size())

2
PowerEditor/src/WinControls/TabBar/TabBar.cpp
View File

@ -1250,7 +1250,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode)
}
}
const int individualColourId = getIndividualTabColour(nTab);
const int individualColourId = getIndividualTabColourId(nTab);
// draw highlights on tabs (top bar for active tab / darkened background for inactive tab)
RECT barRect = rect;

2
PowerEditor/src/WinControls/TabBar/TabBar.h
View File

@ -223,7 +223,7 @@ public :
}
static void setColour(COLORREF colour2Set, tabColourIndex i, TabBarPlus* tbpObj);
virtual int getIndividualTabColour(int tabIndex) = 0;
virtual int getIndividualTabColourId(int tabIndex) = 0;
void currentTabToStart();
void currentTabToEnd();