From 105690d3213993d6b927d4c277d7a1917e9a4b29 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 21 Apr 2013 17:36:53 +0100 Subject: [PATCH] Minor code editor optimisation. --- .../code_editor/juce_CodeEditorComponent.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp index 99ea25cae9..b37c646f0a 100644 --- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp +++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp @@ -677,6 +677,7 @@ void CodeEditorComponent::scrollToLineInternal (int newFirstLineOnScreen) updateCachedIterators (firstLineOnScreen); rebuildLineTokensAsync(); + pimpl->handleUpdateNowIfNeeded(); } } @@ -1039,14 +1040,16 @@ bool CodeEditorComponent::moveCaretToStartOfLine (const bool selecting) bool CodeEditorComponent::moveCaretToEnd (const bool selecting) { newTransaction(); - moveCaretTo (CodeDocument::Position (document, std::numeric_limits::max(), std::numeric_limits::max()), selecting); + moveCaretTo (CodeDocument::Position (document, std::numeric_limits::max(), + std::numeric_limits::max()), selecting); return true; } bool CodeEditorComponent::moveCaretToEndOfLine (const bool selecting) { newTransaction(); - moveCaretTo (CodeDocument::Position (document, caretPos.getLineNumber(), std::numeric_limits::max()), selecting); + moveCaretTo (CodeDocument::Position (document, caretPos.getLineNumber(), + std::numeric_limits::max()), selecting); return true; } @@ -1057,13 +1060,9 @@ bool CodeEditorComponent::deleteBackwards (const bool moveInWholeWordSteps) cut(); // in case something is already highlighted moveCaretTo (document.findWordBreakBefore (caretPos), true); } - else + else if (selectionStart == selectionEnd && ! skipBackwardsToPreviousTab()) { - if (selectionStart == selectionEnd) - { - if (! skipBackwardsToPreviousTab()) - selectionStart.moveBy (-1); - } + selectionStart.moveBy (-1); } cut(); @@ -1114,7 +1113,8 @@ bool CodeEditorComponent::deleteForwards (const bool moveInWholeWordSteps) bool CodeEditorComponent::selectAll() { newTransaction(); - selectRegion (CodeDocument::Position (document, std::numeric_limits::max(), std::numeric_limits::max()), + selectRegion (CodeDocument::Position (document, std::numeric_limits::max(), + std::numeric_limits::max()), CodeDocument::Position (document, 0, 0)); return true; }