tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 15:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix auto-completion detection language bug.

Browse Source 
[UPDATE] (Author: Motaz) Enhance the installer icon.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@720 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-12-04 15:06:26 +00:00
parent b94ab27b35
commit 17331e2ed6
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PowerEditor/installer/images/npp_inst.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 131 KiB

15
PowerEditor/src/Notepad_plus.cpp
View File

@ -3016,19 +3016,22 @@ void Notepad_plus::checkUnicodeMenuItems() const
} }
} }
void Notepad_plus::showAutoComp() { void Notepad_plus::showAutoComp()
{
bool isFromPrimary = _pEditView == &_mainEditView; bool isFromPrimary = _pEditView == &_mainEditView;
AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub; AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub;
autoC->showAutoComplete(); autoC->showAutoComplete();
} }
void Notepad_plus::autoCompFromCurrentFile(bool autoInsert) { void Notepad_plus::autoCompFromCurrentFile(bool autoInsert)
{
bool isFromPrimary = _pEditView == &_mainEditView; bool isFromPrimary = _pEditView == &_mainEditView;
AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub; AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub;
autoC->showWordComplete(autoInsert); autoC->showWordComplete(autoInsert);
} }
void Notepad_plus::showFunctionComp() { void Notepad_plus::showFunctionComp()
{
bool isFromPrimary = _pEditView == &_mainEditView; bool isFromPrimary = _pEditView == &_mainEditView;
AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub; AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub;
autoC->showFunctionComplete(); autoC->showFunctionComplete();
@ -4128,14 +4131,9 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask)
void Notepad_plus::notifyBufferActivated(BufferID bufid, int view) void Notepad_plus::notifyBufferActivated(BufferID bufid, int view)
{ {
Buffer * buf = MainFileManager->getBufferByID(bufid); Buffer * buf = MainFileManager->getBufferByID(bufid);
buf->increaseRecentTag(); buf->increaseRecentTag();
NppParameters *pNppParam = NppParameters::getInstance();
const NppGUI & nppGUI = pNppParam->getNppGUI();
if (nppGUI._autocStatus == nppGUI.autoc_func)
{
if (view == MAIN_VIEW) if (view == MAIN_VIEW)
{ {
_autoCompleteMain.setLanguage(buf->getLangType()); _autoCompleteMain.setLanguage(buf->getLangType());
@ -4144,7 +4142,6 @@ void Notepad_plus::notifyBufferActivated(BufferID bufid, int view)
{ {
_autoCompleteSub.setLanguage(buf->getLangType()); _autoCompleteSub.setLanguage(buf->getLangType());
} }
}
if (view != currentView()) if (view != currentView())
return; //dont care if another view did something return; //dont care if another view did something