Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-10 08:41:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

UITextInput: Added setEscapePastedText/getEscapePastedText. Added event Event::OnTextPasted.

Browse Source 
UICodeEditor: Show highlight range in minimap. Don't draw selection match in the actual selection. Added event Event::OnTextPasted.
TextPosition: Fixed operator <= and >=.
SyntaxDefinitionManager: Separated JSON from JavaScript.
SyntaxColorScheme: "Renamed line_number_background" to "gutter_background". Added "selection_region".
LinterModule: Added JSON linter. Added configuration "no_errors_exit_code". Minor rendering improvements.
ecode:
DocSearchController: Fixed selection range region. Minor fixes.
This commit is contained in:
Martín Lucas Golini
2022-05-28 01:37:36 -03:00
parent 84ea86a81b
commit f9123e259d
14 changed files with 142 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tools/ecode/docsearchcontroller.cpp
View File

@@ -30,6 +30,7 @@ void DocSearchController::initSearchBar(
kbind.addKeybindsStringUnordered( keybindings );
UITextInput* findInput = mSearchBarLayout->find<UITextInput>( "search_find" );
findInput->setEscapePastedText( true );
UITextInput* replaceInput = mSearchBarLayout->find<UITextInput>( "search_replace" );
UICheckBox* caseSensitiveChk = mSearchBarLayout->find<UICheckBox>( "case_sensitive" );
UICheckBox* escapeSequenceChk = mSearchBarLayout->find<UICheckBox>( "escape_sequence" );
@@ -86,6 +87,14 @@ void DocSearchController::initSearchBar(
}
}
} );
findInput->addEventListener(
Event::OnTextPasted, [&, findInput, escapeSequenceChk]( const Event* ) {
if ( findInput->getUISceneNode()->getWindow()->getClipboard()->getText().find( '\n' ) !=
String::InvalidPos ) {
if ( !escapeSequenceChk->isChecked() )
escapeSequenceChk->setChecked( true );
}
} );
mSearchBarLayout->addCommand( "close-searchbar", [&] {
hideSearchBar();
if ( mEditorSplitter->getCurEditor() )
@@ -161,22 +170,16 @@ void DocSearchController::showFindView() {
if ( doc.getSelection().hasSelection() ) {
String text = doc.getSelectedText();
if ( !doc.getSelection().inSameLine() ) {
text.escape();
UICheckBox* escapeSequenceChk = mSearchBarLayout->find<UICheckBox>( "escape_sequence" );
if ( !escapeSequenceChk->isChecked() )
escapeSequenceChk->setChecked( true );
}
if ( !text.empty() ) {
if ( !doc.getSelection().inSameLine() )
mSearchState.range = doc.getSelection( true );
if ( !text.empty() && doc.getSelection().inSameLine() ) {
findInput->setText( text );
findInput->getDocument().selectAll();
} else if ( !findInput->getText().empty() ) {
findInput->getDocument().selectAll();
}
} else if ( doc.getSelection().hasSelection() ) {
mSearchState.range = doc.getSelection( true );
if ( !findInput->getText().empty() )
findInput->getDocument().selectAll();
}
mSearchState.text = findInput->getText();
editor->setHighlightTextRange( mSearchState.range );