Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Draw whitespaces optimiation in UICodeEditor.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-08-31 01:23:15 -03:00
parent 9014f9eb4c
commit 1df50cb82e
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/eepp/ui/uicodeeditor.hpp
View File

@@ -82,30 +82,30 @@ class UICodeEditorPlugin {
}
virtual void drawBeforeLineText( UICodeEditor*, const Int64&, Vector2f, const Float&,
const Float& ){};
const Float& ) {};
virtual void drawAfterLineText( UICodeEditor* /*editor*/, const Int64& /*index*/,
Vector2f /*position*/, const Float& /*fontSize*/,
const Float& /*lineHeight*/ ){};
const Float& /*lineHeight*/ ) {};
virtual void minimapDrawBefore( UICodeEditor* /*editor*/, const DocumentLineRange&,
const DocumentViewLineRange&, const Vector2f& /*linePos*/,
const Vector2f& /*lineSize*/, const Float& /*charWidth*/,
const Float& /*gutterWidth*/,
const DrawTextRangesFn& /* drawTextRanges */ ){};
const DrawTextRangesFn& /* drawTextRanges */ ) {};
virtual void minimapDrawAfter( UICodeEditor* /*editor*/, const DocumentLineRange&,
const DocumentViewLineRange&, const Vector2f& /* linePos */,
const Vector2f& /* lineSize */, const Float& /* charWidth */,
const Float& /* gutterWidth */,
const DrawTextRangesFn& /* drawTextRanges */ ){};
const DrawTextRangesFn& /* drawTextRanges */ ) {};
virtual void drawGutter( UICodeEditor* /*editor*/, const Int64& /*index*/,
const Vector2f& /*screenStart*/, const Float& /*lineHeight*/,
const Float& /*gutterWidth*/, const Float& /*fontSize*/ ){};
const Float& /*gutterWidth*/, const Float& /*fontSize*/ ) {};
virtual void drawTop( UICodeEditor* /*editor*/, const Vector2f& /*screenStart*/,
const Sizef& /*size*/, const Float& /*fontSize*/ ){};
const Sizef& /*size*/, const Float& /*fontSize*/ ) {};
Uint32 addOnReadyCallback( const OnReadyCb& cb ) {
mOnReadyCallbacks[mReadyCbNum++] = cb;
@@ -955,7 +955,8 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client {
bool ignoreSelectionMatch = false );
virtual void drawWhitespaces( const DocumentLineRange& lineRange, const Vector2f& startScroll,
const Float& lineHeight );
const Float& lineHeight,
const DocumentViewLineRange& visualLineRange );
virtual void drawIndentationGuides( const DocumentLineRange& lineRange,
const Vector2f& startScroll, const Float& lineHeight );

19
src/eepp/ui/uicodeeditor.cpp
View File

@@ -323,7 +323,7 @@ void UICodeEditor::draw() {
// Draw tab marker
if ( mShowWhitespaces ) {
drawWhitespaces( lineRange, startScroll, lineHeight );
drawWhitespaces( lineRange, startScroll, lineHeight, visualLineRange );
}
if ( mShowLineEndings ) {
@@ -1475,7 +1475,7 @@ Uint32 UICodeEditor::onMouseMove( const Vector2i& position, const Uint32& flags
if ( !minimapHover && isTextSelectionEnabled() &&
!getUISceneNode()->getEventDispatcher()->isNodeDragging() && NULL != mFont && mMouseDown &&
( flags & EE_BUTTON_LMASK ) && localPos.y >= mPluginsTopSpace ) {
( flags & EE_BUTTON_LMASK ) && ( localPos.y <= 0 || localPos.y >= mPluginsTopSpace ) ) {
TextRange selection = mDoc->getSelection();
selection.setStart( resolveScreenPosition( position.asFloat() ) );
mDoc->setSelection( selection );
@@ -3903,7 +3903,8 @@ void UICodeEditor::drawColorPreview( const Vector2f& startScroll, const Float& l
}
void UICodeEditor::drawWhitespaces( const DocumentLineRange& lineRange, const Vector2f& startScroll,
const Float& lineHeight ) {
const Float& lineHeight,
const DocumentViewLineRange& visualLineRange ) {
static const String tab = "\t";
Float tabWidth = getTextWidth( tab );
Float glyphW = getGlyphWidth();
@@ -3928,13 +3929,23 @@ void UICodeEditor::drawWhitespaces( const DocumentLineRange& lineRange, const Ve
cpoint->setDrawMode( GlyphDrawable::DrawMode::Text );
adv->setColor( color );
cpoint->setColor( color );
auto startRange = mDocView.getVisibleIndexRange( visualLineRange.first );
auto endRange = mDocView.getVisibleIndexRange( visualLineRange.second );
TextRange visibleDocRange( startRange.start(), endRange.end() );
for ( auto index = lineRange.first; index <= lineRange.second; index++ ) {
if ( !mDocView.isLineVisible( index ) )
continue;
const auto& text = mDoc->line( index ).getText();
if ( mDocView.isWrappedLine( index ) || !mFont->isMonospace() ) {
for ( size_t i = 0; i < text.size(); i++ ) {
size_t startCol =
visibleDocRange.start().line() == index ? visibleDocRange.start().column() : 0;
size_t endCol = visibleDocRange.end().line() == index ? visibleDocRange.end().column()
: text.size();
for ( size_t i = startCol; i < endCol; i++ ) {
if ( ' ' == text[i] ) {
auto offset =
startScroll +