refs #31, Added Controller::borderedTextRanges for rendering non-selected ranges with a border

gamecreature · gamecreature · commit a15b3ca75f5c · 2017-06-25T10:06:18.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 edbee.lib:
 
-- ref #30, Edbee crashes when you cut/copy with nothing selected. (Bug in clipboard operation)
-- ref #27, Theme loading/handling bugfixes
+- add #31, Support for rendering borderedTextRanges. These are textranges rendered with borders, that aren't selected. TextEditorController has a member 'borderedTextRanges()'. Altering this rangeset (and updating the view controller::update) renderes borders aroudn the given ranges
+- fix #30, Edbee crashes when you cut/copy with nothing selected. (Bug in clipboard operation)
+- fix #27, Theme loading/handling bugfixes
 	- Theme-colors with alpha channels are parsed correctly. (QColor expects #AARRGGBB, theme uses #RRGGBBAA)
 	- Transparent main background color is changed to opaque to fix rendering issues. 
 	- Bugfixes TextThemeManager::theme, local scope shadowed returned theme value and double insert. 
diff --git a/edbee-lib/edbee/models/textsearcher.cpp b/edbee-lib/edbee/models/textsearcher.cpp
@@ -219,27 +219,34 @@ bool TextSearcher::selectAll( TextRangeSet* selection )
 {
     TextRange oldRange = selection->range(0);
 
+    markAll(selection);
+
+    // no selection, we MUST place a caret
+    if( selection->rangeCount() == 0 ) {
+        selection->addRange(oldRange.caret(), oldRange.caret());
+        return false;
+    }
+    return true;
+}
+
+/// Put all found items in the ranges
+/// @param rangeset the rangeset to search for
+void TextSearcher::markAll(TextRangeSet *rangeset)
+{
     // clear the selection and add all matches
     bool oldReverse = reverse_;     // we must NOT reverse find
     bool oldWrapAround = wrapAround_;
     reverse_ = false;
     wrapAround_ = false;
-    selection->clear();
-    TextRange range = findNextRange(selection);
+    rangeset->clear();
+    TextRange range = findNextRange(rangeset);
     while( !range.isEmpty() )
     {
-        selection->addRange(range.anchor(), range.caret());
-        range = findNextRange( selection );
+        rangeset->addRange(range.anchor(), range.caret());
+        range = findNextRange( rangeset );
     }
     wrapAround_ = oldWrapAround;
     reverse_ = oldReverse;
-
-    // no selection, we MUST place a caret
-    if( selection->rangeCount() == 0 ) {
-        selection->addRange(oldRange.caret(), oldRange.caret());
-        return false;
-    }
-    return true;
 }
 
 
diff --git a/edbee-lib/edbee/models/textsearcher.h b/edbee-lib/edbee/models/textsearcher.h
@@ -55,6 +55,7 @@ class TextSearcher : public QObject
     bool selectNext( TextRangeSet* selection );
     bool selectPrev( TextRangeSet* selection );
     bool selectAll( TextRangeSet* selection );
+    void markAll( TextRangeSet* rangeset );
 
 public slots:
 
diff --git a/edbee-lib/edbee/texteditorcontroller.cpp b/edbee-lib/edbee/texteditorcontroller.cpp
@@ -57,6 +57,7 @@ TextEditorController::TextEditorController( TextEditorWidget* widget, QObject *p
     , textCaretCache_(0)
     , textSearcher_(0)
     , autoScrollToCaret_(AutoScrollAlways)
+    , borderedTextRanges_(0)
 {
 
     // create the keymap
@@ -78,6 +79,7 @@ TextEditorController::TextEditorController( TextEditorWidget* widget, QObject *p
 /// Destroys the controller and associated objects
 TextEditorController::~TextEditorController()
 {
+    delete borderedTextRanges_;
     delete textSearcher_;
     delete textRenderer_;
     delete textCaretCache_;
@@ -140,6 +142,10 @@ void TextEditorController::setTextDocument(TextDocument* doc)
         textSelection_ = new TextSelection( this );
         textSelection_->addRange(0,0);  // add at least one cursor :-)
 
+        delete borderedTextRanges_;
+        borderedTextRanges_ = new DynamicTextRangeSet(textDocument());
+
+
         textDocumentRef_->textUndoStack()->registerContoller(this);
 
         connect( textDocumentRef_, SIGNAL(textChanged(edbee::TextBufferChange)), this, SLOT(onTextChanged(edbee::TextBufferChange)));
@@ -243,7 +249,15 @@ TextSelection* TextEditorController::textSelection() const
 /// Returns the current text renderer
 TextRenderer*TextEditorController::textRenderer() const
 {
-     return textRenderer_;
+    return textRenderer_;
+}
+
+
+/// returns the bordered textranges
+/// These are textranges that are rendered with a border, but aren't truely selected
+TextRangeSet *TextEditorController::borderedTextRanges() const
+{
+    return borderedTextRanges_;
 }
 
 
diff --git a/edbee-lib/edbee/texteditorcontroller.h b/edbee-lib/edbee/texteditorcontroller.h
@@ -68,6 +68,8 @@ class TextEditorController : public QObject
     TextDocument* textDocument() const;
     TextSelection* textSelection() const;
     TextRenderer* textRenderer() const;
+    TextRangeSet* borderedTextRanges() const;
+
     void setKeyMap( TextEditorKeyMap* keyMap );
     void giveKeyMap( TextEditorKeyMap* keyMap );
     TextEditorKeyMap* keyMap() const;
@@ -147,6 +149,7 @@ public slots:
     TextDocument* textDocumentRef_;           ///< The reference to the text-document
 
     TextSelection* textSelection_;            ///< The text selection
+
     TextEditorKeyMap* keyMap_;                ///< The ownership of the keymap
     TextEditorKeyMap* keyMapRef_;             ///< A reference to the keymap
     TextEditorCommandMap* commandMap_;        ///< the ownership
@@ -157,6 +160,10 @@ public slots:
     TextSearcher* textSearcher_;              ///< The text-searcher
     
     AutoScrollToCaret autoScrollToCaret_;     ///< This flags tells the editor to automaticly scrol to the caret
+
+
+    // extra highlight text
+    TextRangeSet* borderedTextRanges_;       ///< Extra marked text ranges
 };
 
 } // edbee
diff --git a/edbee-lib/edbee/views/components/texteditorrenderer.cpp b/edbee-lib/edbee/views/components/texteditorrenderer.cpp
@@ -10,6 +10,7 @@
 
 #include "edbee/models/textdocument.h"
 #include "edbee/models/texteditorconfig.h"
+#include "edbee/texteditorcontroller.h"
 #include "edbee/views/texttheme.h"
 #include "edbee/views/textselection.h"
 #include "edbee/views/textrenderer.h"
@@ -60,6 +61,7 @@ void TextEditorRenderer::render(QPainter *painter)
         renderLineSelection( painter, line );
         renderLineSeparator( painter, line );
         renderLineText( painter, line );
+        renderLineBorderedRanges( painter, line );
     }
 
     renderCarets(painter);
@@ -112,6 +114,48 @@ void TextEditorRenderer::renderLineSelection(QPainter *painter,int line)
 }
 
 
+void TextEditorRenderer::renderLineBorderedRanges(QPainter *painter,int line)
+{
+//PROF_BEGIN_NAMED("render-selection")
+    TextDocument* doc = renderer()->textDocument();
+    TextRangeSet* sel = renderer()->controller()->borderedTextRanges();
+    int lineHeight = renderer()->lineHeight();
+
+    QPen pen(themeRef_->foregroundColor(), 0.5);
+
+
+    int firstRangeIdx=0;
+    int lastRangeIdx=0;
+/// TODO: iprove ranges at line by calling rangesForOffsets first for only the visible offsets!
+    if( sel->rangesAtLine( line, firstRangeIdx, lastRangeIdx ) ) {
+
+        QTextLayout* textLayout = renderer()->textLayoutForLine(line);
+        QRectF rect = textLayout->boundingRect();
+        QTextLine textLine = textLayout->lineAt(0);
+
+        int lastLineColumn = doc->lineLength(line);
+
+        // draw all 'ranges' on this line
+        for( int rangeIdx = firstRangeIdx; rangeIdx <= lastRangeIdx; ++rangeIdx ) {
+            TextRange& range = sel->range(rangeIdx);
+            int startColumn = doc->columnFromOffsetAndLine( range.min(), line );
+            int endColumn   = doc->columnFromOffsetAndLine( range.max(), line );
+
+            int startX = textLine.cursorToX( startColumn );
+            int endX   = textLine.cursorToX( endColumn );
+
+            if( range.length() > 0 && endColumn+1 >= lastLineColumn) endX += 3;
+
+            QPainterPath path;
+            path.addRoundedRect(startX, line*lineHeight + rect.top(), endX - startX, rect.height(),5,5);
+            painter->strokePath(path, pen);
+//            painter->strok(startX, line*lineHeight + rect.top(), endX - startX, rect.height(),  themeRef_->selectionColor() ); //QColor::fromRgb(0xDD, 0x88, 0xEE) );
+        }
+    }
+//PROF_END
+}
+
+
 
 void TextEditorRenderer::renderLineSeparator(QPainter *painter,int line)
 {
diff --git a/edbee-lib/edbee/views/components/texteditorrenderer.h b/edbee-lib/edbee/views/components/texteditorrenderer.h
@@ -24,6 +24,7 @@ class TextEditorRenderer
     virtual void render(QPainter* painter);
     virtual void renderLineBackground(QPainter *painter, int line);
     virtual void renderLineSelection(QPainter *painter, int line);
+    virtual void renderLineBorderedRanges(QPainter *painter, int line);
     virtual void renderLineSeparator(QPainter *painter, int line);
     virtual void renderLineText(QPainter *painter, int line);
     virtual void renderCarets(QPainter *painter);
diff --git a/edbee-lib/edbee/views/textrenderer.cpp b/edbee-lib/edbee/views/textrenderer.cpp
@@ -41,6 +41,7 @@ TextRenderer::TextRenderer(TextEditorController* controller)
 {
     connect( controller, SIGNAL(textDocumentChanged(edbee::TextDocument*,edbee::TextDocument*)), this, SLOT(textDocumentChanged(edbee::TextDocument*,edbee::TextDocument*)));
     textThemeStyler_ = new TextThemeStyler( controller );
+
 }
 
 
diff --git a/edbee-lib/edbee/views/textrenderer.h b/edbee-lib/edbee/views/textrenderer.h
@@ -25,6 +25,7 @@ class TextDocument;
 class TextEditorConfig;
 class TextEditorController;
 class TextEditorWidget;
+class TextRangeSet;
 class TextSelection;
 class TextTheme;
 class TextThemeStyler;
@@ -93,7 +94,6 @@ Q_OBJECT
     void setThemeByName( const QString& name );
     void setTheme( TextTheme* theme );
 
-
 // temporary getters only valid while rendering!!
     const QRect* clipRect() { return clipRectRef_; }                ///< This method is valid only while rendering!
     int startOffset() { return startOffset_; }                      ///< This method is valid only while rendering!

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ TextRenderer::TextRenderer(TextEditorController* controller)`
`41`	`41`	`{`
`42`	`42`	`connect( controller, SIGNAL(textDocumentChanged(edbee::TextDocument,edbee::TextDocument)), this, SLOT(textDocumentChanged(edbee::TextDocument,edbee::TextDocument)));`
`43`	`43`	`textThemeStyler_ = new TextThemeStyler( controller );`
	`44`	`+`
`44`	`45`	`}`
`45`	`46`
`46`	`47`