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

[BUG_FIXED] Fix the NOTEPAD++ getting focus problem while find dialog is activated.

Browse Source 
Fix unwanted selection after popup dialog (keep file) when the file opend is deleted.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@45 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2007-09-25 21:27:06 +00:00
parent 32aac71481
commit 140abd70f8
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/src/Notepad_plus.cpp
View File

@ -1240,7 +1240,7 @@ string Notepad_plus::getLangDesc(LangType langType, bool shortDesc)
"NFO", "MSDOS Style/ASCII Art", "NFO", "MSDOS Style/ASCII Art",
"udf", "User Define File", "udf", "User Define File",
"ASP", "Active Server Pages script file", "ASP", "Active Server Pages script file",
"SQL", "Structure Query Language file", "SQL", "Structured Query Language file",
"VB", "Visual Basic file", "VB", "Visual Basic file",
"JavaScript", "JavaScript file", "JavaScript", "JavaScript file",
"CSS", "Cascade Style Sheets File", "CSS", "Cascade Style Sheets File",
@ -1340,7 +1340,7 @@ void Notepad_plus::getApiFileName(LangType langType, string &fn)
case L_LISP : fn = "lisp"; break; case L_LISP : fn = "lisp"; break;
case L_SCHEME : fn = "sheme"; break; case L_SCHEME : fn = "scheme"; break;
case L_ASM : case L_ASM :
fn = "asm"; break; fn = "asm"; break;
@ -3900,6 +3900,14 @@ void Notepad_plus::checkModifiedDocument()
else else
pDocTabArray[j]->closeCurrentDoc(); pDocTabArray[j]->closeCurrentDoc();
} }
if (_activeAppInf._isActivated)
{
int curPos = _pEditView->execute(SCI_GETCURRENTPOS);
::PostMessage(_pEditView->getHSelf(), WM_LBUTTONUP, 0, 0);
::PostMessage(_pEditView->getHSelf(), SCI_SETSEL, curPos, curPos);
_activeAppInf._isActivated = false;
}
} }
bool isReadOnly = pScintillaArray[j]->isCurrentBufReadOnly(); bool isReadOnly = pScintillaArray[j]->isCurrentBufReadOnly();

10
PowerEditor/src/ScitillaComponent/Buffer.h
View File

@ -290,18 +290,18 @@ public :
return NULL; return NULL;
return l->_pCommentEnd; return l->_pCommentEnd;
}; };
/*
const Position & getPosition() const { const Position & getPosition() const {
return _pos; return _pos;
} };
*/
LangType getLangType() const { LangType getLangType() const {
return _lang; return _lang;
} };
void setPosition(const Position& pos) { void setPosition(const Position& pos) {
_pos = pos; _pos = pos;
} };
private : private :
bool _isDirty; bool _isDirty;

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
View File

@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 321, 179 IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 321, 179
//STYLE DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU //STYLE DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Replace" CAPTION "Replace"