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

Various general optimizations, inlined a bunch of functions, did a bunch of optimizations in UICodeEditor::drawMinimap, render times are about +10% faster for some common ecode escenarios.

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-08-31 19:21:25 -03:00
parent 36200430aa
commit 6e467dbb59
18 changed files with 128 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/eepp/graphics/font.hpp
+3 -1
View File
@@ -140,7 +140,9 @@ class EE_API Font {
/** Returns the horizontal advance without requiring a renderable glyph texture. */ /** Returns the horizontal advance without requiring a renderable glyph texture. */
virtual Float getGlyphAdvance( Uint32 codePoint, unsigned int characterSize, bool bold = false, virtual Float getGlyphAdvance( Uint32 codePoint, unsigned int characterSize, bool bold = false,
bool italic = false, Float outlineThickness = 0 ) const; bool italic = false, Float outlineThickness = 0 ) const {
return getGlyph( codePoint, characterSize, bold, italic, outlineThickness ).advance;
}
/** @return The glyph drawable that represents the glyph in a texture. The glyph drawable /** @return The glyph drawable that represents the glyph in a texture. The glyph drawable
* allocation is managed by the font. */ * allocation is managed by the font. */
include/eepp/graphics/glyphdrawable.hpp
+6 -6
View File
@@ -43,20 +43,20 @@ class EE_API GlyphDrawable : public DrawableResource {
const TexturePtr& getTexture() const; const TexturePtr& getTexture() const;
/** @return The Texture sector that represents the GlyphDrawable */ /** @return The Texture sector that represents the GlyphDrawable */
const Rectf& getSrcRect() const; inline const Rectf& getSrcRect() const { return mSrcRect; }
const Sizef& getDestSize() const; inline const Sizef& getDestSize() const { return mDestSize; }
/** @return This is the same as Destination Size but with the values rounded as integers. */ /** @return This is the same as Destination Size but with the values rounded as integers. */
Sizef getSize(); Sizef getSize();
Sizef getPixelsSize(); Sizef getPixelsSize();
const Float& getPixelDensity() const; inline const Float& getPixelDensity() const { return mPixelDensity; }
void setPixelDensity( const Float& pixelDensity ); void setPixelDensity( const Float& pixelDensity );
const Vector2f& getGlyphOffset() const; inline const Vector2f& getGlyphOffset() const { return mGlyphOffset; }
void setGlyphOffset( const Vector2f& glyphOffset ); void setGlyphOffset( const Vector2f& glyphOffset );
@@ -64,11 +64,11 @@ class EE_API GlyphDrawable : public DrawableResource {
void setDrawMode( const DrawMode& drawMode ); void setDrawMode( const DrawMode& drawMode );
bool isItalic() const { return mIsItalic; } inline bool isItalic() const { return mIsItalic; }
void setIsItalic( bool isItalic ); void setIsItalic( bool isItalic );
const Float& getAdvance() const; inline const Float& getAdvance() const { return mAdvance; }
void setAdvance( Float advance ); void setAdvance( Float advance );
include/eepp/graphics/image.hpp
+1 -1
View File
@@ -155,7 +155,7 @@ class EE_API Image {
/** @return The save type from a given extension ( example: "png" => SaveType::SAVE_TYPE_PNG ) /** @return The save type from a given extension ( example: "png" => SaveType::SAVE_TYPE_PNG )
*/ */
static SaveType extensionToSaveType( const std::string& Extension ); static SaveType extensionToSaveType( std::string_view extension );
/** @return Convert the number of channels to a pixel format */ /** @return Convert the number of channels to a pixel format */
static PixelFormat channelsToPixelFormat( const Uint32& channels ); static PixelFormat channelsToPixelFormat( const Uint32& channels );
include/eepp/graphics/linewrap.hpp
+10 -3
View File
@@ -28,7 +28,9 @@ class EE_API LineWrap {
static std::string fromLineWrapType( LineWrapType type ); static std::string fromLineWrapType( LineWrapType type );
static bool isWrapChar( String::StringBaseType ch ); static inline bool isWrapChar( String::StringBaseType ch ) {
return ch == ' ' || ch == '.' || ch == '-' || ch == ',';
}
static LineWrapInfo static LineWrapInfo
computeLineBreaks( const String::View& string, Font* font, Uint32 characterSize, Float maxWidth, computeLineBreaks( const String::View& string, Font* font, Uint32 characterSize, Float maxWidth,
@@ -88,8 +90,13 @@ class EE_API LineWrap {
Uint32 fontStyle, Float outlineThickness, Uint32 tabWidth = 0.f, Uint32 fontStyle, Float outlineThickness, Uint32 tabWidth = 0.f,
Float maxWidth = 0.f, bool tabStops = false ); Float maxWidth = 0.f, bool tabStops = false );
static Float computeOffsets( const String::View& string, const FontStyleConfig& fontStyle, static inline Float computeOffsets( const String::View& string,
Uint32 tabWidth, Float maxWidth = 0.f, bool tabStops = false ); const FontStyleConfig& fontStyle, Uint32 tabWidth,
Float maxWidth = 0.f, bool tabStops = false ) {
return LineWrap::computeOffsets( string, fontStyle.Font, fontStyle.CharacterSize,
fontStyle.Style, fontStyle.OutlineThickness, tabWidth,
maxWidth, tabStops );
}
protected: protected:
template <typename T> template <typename T>
include/eepp/graphics/renderer/renderer.hpp
+2 -2
View File
@@ -324,9 +324,9 @@ class EE_API Renderer {
void getCompressedTexImage( unsigned int target, int level, void* pixels ); void getCompressedTexImage( unsigned int target, int level, void* pixels );
const bool& quadsSupported() const; inline bool quadsSupported() const { return mQuadsSupported; }
const int& quadVertex() const; inline int quadVertex() const { return mQuadVertex; }
ClippingMask* getClippingMask() const; ClippingMask* getClippingMask() const;
include/eepp/graphics/text.hpp
+12 -2
View File
@@ -48,8 +48,18 @@ class EE_API Text {
( textDrawHints & ( TextHints::AllLatin1 | TextHints::AllAscii ) ) != 0; ( textDrawHints & ( TextHints::AllLatin1 | TextHints::AllAscii ) ) != 0;
} }
static Float tabAdvance( Float spaceHorizontalAdvance, Uint32 tabLength, static inline Float tabAdvance( Float spaceHorizontalAdvance, Uint32 tabLength,
std::optional<Float> tabOffset ); std::optional<Float> tabOffset ) {
Float advance = spaceHorizontalAdvance * tabLength;
if ( tabOffset ) {
Float offset = fmodf( *tabOffset, advance );
advance = advance - offset;
// If there is not enough space until the next stop, skip it
if ( advance < spaceHorizontalAdvance )
advance += spaceHorizontalAdvance * tabLength;
}
return advance;
}
static std::string styleFlagToString( const Uint32& flags ); static std::string styleFlagToString( const Uint32& flags );
include/eepp/ui/css/mediaquery.hpp
+1 -1
View File
@@ -157,7 +157,7 @@ class EE_API MediaQueryList {
static MediaQueryList::ptr parse( const std::string& str ); static MediaQueryList::ptr parse( const std::string& str );
bool isUsed() const; inline bool isUsed() const { return mUsed; }
bool applyMediaFeatures( const MediaFeatures& features ); // returns true if the isUsed changed bool applyMediaFeatures( const MediaFeatures& features ); // returns true if the isUsed changed
include/eepp/ui/css/stylesheetstyle.hpp
+1 -1
View File
@@ -57,7 +57,7 @@ class EE_API StyleSheetStyle {
void setVariable( const StyleSheetVariable& variable, bool setSelectorSpecificity = true ); void setVariable( const StyleSheetVariable& variable, bool setSelectorSpecificity = true );
bool isMediaValid() const { return !mMediaQueryList || mMediaQueryList->isUsed(); } inline bool isMediaValid() const { return !mMediaQueryList || mMediaQueryList->isUsed(); }
const MediaQueryList::ptr& getMediaQueryList() const; const MediaQueryList::ptr& getMediaQueryList() const;
src/eepp/graphics/font.cpp
-5
View File
@@ -87,11 +87,6 @@ const FontType& Font::getType() const {
return mType; return mType;
} }
Float Font::getGlyphAdvance( Uint32 codePoint, unsigned int characterSize, bool bold, bool italic,
Float outlineThickness ) const {
return getGlyph( codePoint, characterSize, bold, italic, outlineThickness ).advance;
}
const std::string& Font::getName() const { const std::string& Font::getName() const {
return mFontName; return mFontName;
} }
src/eepp/graphics/glyphdrawable.cpp
-20
View File
@@ -98,14 +98,6 @@ const TexturePtr& GlyphDrawable::getTexture() const {
return mTexture; return mTexture;
} }
const Rectf& GlyphDrawable::getSrcRect() const {
return mSrcRect;
}
const Sizef& GlyphDrawable::getDestSize() const {
return mDestSize;
}
Sizef GlyphDrawable::getSize() { Sizef GlyphDrawable::getSize() {
if ( mDestSize != Sizef::Zero ) if ( mDestSize != Sizef::Zero )
return Sizef( mDestSize.getWidth() / mPixelDensity, mDestSize.getHeight() / mPixelDensity ); return Sizef( mDestSize.getWidth() / mPixelDensity, mDestSize.getHeight() / mPixelDensity );
@@ -118,18 +110,10 @@ Sizef GlyphDrawable::getPixelsSize() {
return Sizef( mSrcRect.Right, mSrcRect.Bottom ); return Sizef( mSrcRect.Right, mSrcRect.Bottom );
} }
const Float& GlyphDrawable::getPixelDensity() const {
return mPixelDensity;
}
void GlyphDrawable::setPixelDensity( const Float& pixelDensity ) { void GlyphDrawable::setPixelDensity( const Float& pixelDensity ) {
mPixelDensity = pixelDensity; mPixelDensity = pixelDensity;
} }
const Vector2f& GlyphDrawable::getGlyphOffset() const {
return mGlyphOffset;
}
void GlyphDrawable::setGlyphOffset( const Vector2f& glyphOffset ) { void GlyphDrawable::setGlyphOffset( const Vector2f& glyphOffset ) {
mGlyphOffset = glyphOffset.roundDown(); mGlyphOffset = glyphOffset.roundDown();
} }
@@ -146,10 +130,6 @@ void GlyphDrawable::setIsItalic( bool isItalic ) {
mIsItalic = isItalic; mIsItalic = isItalic;
} }
const Float& GlyphDrawable::getAdvance() const {
return mAdvance;
}
void GlyphDrawable::setAdvance( Float advance ) { void GlyphDrawable::setAdvance( Float advance ) {
mAdvance = advance; mAdvance = advance;
} }
src/eepp/graphics/image.cpp
+15 -13
View File
@@ -485,22 +485,23 @@ std::string Image::saveTypeToExtension( Image::SaveType Format ) {
return ""; return "";
} }
Image::SaveType Image::extensionToSaveType( const std::string& Extension ) { Image::SaveType Image::extensionToSaveType( std::string_view extension ) {
SaveType saveType = SaveType::Unknown; SaveType saveType = SaveType::Unknown;
if ( Extension == "tga" ) if ( String::iequals( extension, "tga" ) )
saveType = SaveType::TGA; saveType = SaveType::TGA;
else if ( Extension == "bmp" ) else if ( String::iequals( extension, "bmp" ) )
saveType = SaveType::BMP; saveType = SaveType::BMP;
else if ( Extension == "png" ) else if ( String::iequals( extension, "png" ) )
saveType = SaveType::PNG; saveType = SaveType::PNG;
else if ( Extension == "dds" ) else if ( String::iequals( extension, "dds" ) )
saveType = SaveType::DDS; saveType = SaveType::DDS;
else if ( Extension == "jpg" || Extension == "jpeg" ) else if ( String::iequals( extension, "jpg" ) || String::iequals( extension, "jpeg" ) ||
String::iequals( extension, "jfif" ) )
saveType = SaveType::JPG; saveType = SaveType::JPG;
else if ( Extension == "qoi" ) else if ( String::iequals( extension, "qoi" ) )
saveType = SaveType::QOI; saveType = SaveType::QOI;
else if ( Extension == "webp" ) else if ( String::iequals( extension, "webp" ) )
saveType = SaveType::WEBP; saveType = SaveType::WEBP;
return saveType; return saveType;
@@ -654,14 +655,15 @@ Image::Format Image::getFormat( IOStream& stream ) {
bool Image::isImageExtension( const std::string& path ) { bool Image::isImageExtension( const std::string& path ) {
const std::string ext( FileSystem::fileExtension( path ) ); const std::string ext( FileSystem::fileExtension( path ) );
return ( ext == "png" || ext == "tga" || ext == "bmp" || ext == "jpg" || ext == "gif" || return ( ext == "png" || ext == "tga" || ext == "bmp" || ext == "jpg" || ext == "gif" ||
ext == "jpeg" || ext == "dds" || ext == "psd" || ext == "hdr" || ext == "pic" || ext == "jpeg" || ext == "jfif" || ext == "dds" || ext == "psd" || ext == "hdr" ||
ext == "pvr" || ext == "pkm" || ext == "svg" || ext == "qoi" || ext == "webp" || ext == "pic" || ext == "pvr" || ext == "pkm" || ext == "svg" || ext == "qoi" ||
ext == "jpe" || ext == "astc" ); ext == "webp" || ext == "jpe" || ext == "astc" );
} }
std::vector<std::string> Image::getImageExtensionsSupported() { std::vector<std::string> Image::getImageExtensionsSupported() {
return std::vector<std::string>{ "png", "tga", "bmp", "jpg", "gif", "jpeg", "dds", "psd", "hdr", return std::vector<std::string>{ "png", "tga", "bmp", "jpg", "gif", "jpeg",
"pic", "pvr", "pkm", "svg", "qoi", "webp", "jpe", "astc" }; "dds", "psd", "hdr", "pic", "pvr", "pkm",
"svg", "qoi", "webp", "jpe", "astc", "jfif" };
} }
std::string Image::getLastFailureReason() { std::string Image::getLastFailureReason() {
src/eepp/graphics/linewrap.cpp
-11
View File
@@ -44,13 +44,6 @@ std::string LineWrap::fromLineWrapType( LineWrapType type ) {
} }
} }
Float LineWrap::computeOffsets( const String::View& string, const FontStyleConfig& fontStyle,
Uint32 tabWidth, Float maxWidth, bool tabStops ) {
return LineWrap::computeOffsets( string, fontStyle.Font, fontStyle.CharacterSize,
fontStyle.Style, fontStyle.OutlineThickness, tabWidth,
maxWidth, tabStops );
}
Float LineWrap::computeOffsets( const String::View& string, Font* font, Uint32 characterSize, Float LineWrap::computeOffsets( const String::View& string, Font* font, Uint32 characterSize,
Uint32 fontStyle, Float outlineThickness, Uint32 tabWidth, Uint32 fontStyle, Float outlineThickness, Uint32 tabWidth,
Float maxWidth, bool tabStops ) { Float maxWidth, bool tabStops ) {
@@ -245,10 +238,6 @@ LineWrap::computeLineBreaksInternal( const String::View& string, Font* font, Uin
return info; return info;
} }
bool LineWrap::isWrapChar( String::StringBaseType ch ) {
return ch == ' ' || ch == '.' || ch == '-' || ch == ',';
}
LineWrapInfo LineWrap::computeLineBreaks( const String::View& string, Font* font, LineWrapInfo LineWrap::computeLineBreaks( const String::View& string, Font* font,
Uint32 characterSize, Float maxWidth, LineWrapMode mode, Uint32 characterSize, Float maxWidth, LineWrapMode mode,
Uint32 fontStyle, Float outlineThickness, Uint32 fontStyle, Float outlineThickness,
src/eepp/graphics/renderer/renderer.cpp
-7
View File
@@ -836,10 +836,6 @@ void Renderer::getColorMask( Uint8 mask[4] ) const {
std::copy( std::begin( mColorMask ), std::end( mColorMask ), mask ); std::copy( std::begin( mColorMask ), std::end( mColorMask ), mask );
} }
const int& Renderer::quadVertex() const {
return mQuadVertex;
}
ClippingMask* Renderer::getClippingMask() const { ClippingMask* Renderer::getClippingMask() const {
return mClippingMask; return mClippingMask;
} }
@@ -1260,9 +1256,6 @@ void Renderer::genVertexArrays( int n, unsigned int* arrays ) {
#endif #endif
} }
const bool& Renderer::quadsSupported() const {
return mQuadsSupported;
}
void Renderer::waitForIdle() { void Renderer::waitForIdle() {
glFinish(); glFinish();
src/eepp/graphics/text.cpp
+16 -27
View File
@@ -61,18 +61,6 @@ std::string Text::fontFeaturesToString( Uint32 features ) {
return value; return value;
} }
Float Text::tabAdvance( Float hspace, Uint32 tabWidth, std::optional<Float> tabOffset ) {
Float advance = hspace * tabWidth;
if ( tabOffset ) {
Float offset = fmodf( *tabOffset, advance );
advance = advance - offset;
// If there is not enough space until the next stop, skip it
if ( advance < hspace )
advance += hspace * tabWidth;
}
return advance;
}
std::string Text::styleFlagToString( const Uint32& flags ) { std::string Text::styleFlagToString( const Uint32& flags ) {
std::string str; std::string str;
@@ -270,19 +258,20 @@ static inline void drawGlyph( BatchRenderer* BR, GlyphDrawable* gd, const Vector
const Color& color, bool isItalic ) { const Color& color, bool isItalic ) {
BR->setSubpixelText( gd->getGlyphRenderMode() == GlyphRenderMode::Subpixel ); BR->setSubpixelText( gd->getGlyphRenderMode() == GlyphRenderMode::Subpixel );
BR->quadsSetColor( color ); BR->quadsSetColor( color );
BR->quadsSetTexCoord( gd->getSrcRect().Left, gd->getSrcRect().Top, const auto& srcRect = gd->getSrcRect();
gd->getSrcRect().Left + gd->getSrcRect().Right, const auto& offset = gd->getGlyphOffset();
gd->getSrcRect().Top + gd->getSrcRect().Bottom ); const auto& destSize = gd->getDestSize();
BR->quadsSetTexCoord( srcRect.Left, srcRect.Top, srcRect.Left + srcRect.Right,
srcRect.Top + srcRect.Bottom );
if ( isItalic && !gd->isItalic() ) { if ( isItalic && !gd->isItalic() ) {
Float x = position.x + gd->getGlyphOffset().x; Float x = position.x + offset.x;
Float y = position.y + gd->getGlyphOffset().y; Float y = position.y + offset.y;
Float italic = 0.208f * gd->getDestSize().getWidth(); // 12 degrees Float italic = 0.208f * destSize.getWidth(); // 12 degrees
BR->batchQuadFree( x + italic, y, x, y + gd->getDestSize().getHeight(), BR->batchQuadFree( x + italic, y, x, y + destSize.getHeight(), x + destSize.getWidth(),
x + gd->getDestSize().getWidth(), y + gd->getDestSize().getHeight(), y + destSize.getHeight(), x + destSize.getWidth() + italic, y );
x + gd->getDestSize().getWidth() + italic, y );
} else { } else {
BR->batchQuad( position.x + gd->getGlyphOffset().x, position.y + gd->getGlyphOffset().y, BR->batchQuad( position.x + offset.x, position.y + offset.y, destSize.getWidth(),
gd->getDestSize().getWidth(), gd->getDestSize().getHeight() ); destSize.getHeight() );
} }
} }
@@ -1074,7 +1063,7 @@ Float Text::getTextWidth( Font* font, const Uint32& fontSize, const StringType&
static_cast<FontTrueType*>( font )->isIdentifiedAsMonospace() && static_cast<FontTrueType*>( font )->isIdentifiedAsMonospace() &&
canSkipShaping( textDrawHints ) ) ); canSkipShaping( textDrawHints ) ) );
Float hspace = static_cast<Float>( Float hspace = static_cast<Float>(
font->getGlyph( L' ', fontSize, bold, italic, outlineThickness ).advance ); font->getGlyphAdvance( L' ', fontSize, bold, italic, outlineThickness ) );
if ( isMonospace ) { if ( isMonospace ) {
size_t len = string.length(); size_t len = string.length();
@@ -1139,7 +1128,7 @@ Text::findLastCharPosWithinLength( Font* font, const Uint32& fontSize, const Str
bool bold = ( style & Text::Bold ) != 0; bool bold = ( style & Text::Bold ) != 0;
bool italic = ( style & Text::Italic ) != 0; bool italic = ( style & Text::Italic ) != 0;
Float hspace = static_cast<Float>( Float hspace = static_cast<Float>(
font->getGlyph( L' ', fontSize, bold, italic, outlineThickness ).advance ); font->getGlyphAdvance( L' ', fontSize, bold, italic, outlineThickness ) );
#ifdef EE_TEXT_SHAPER_ENABLED #ifdef EE_TEXT_SHAPER_ENABLED
if ( TextShaperEnabled && font->getType() == FontType::TTF && if ( TextShaperEnabled && font->getType() == FontType::TTF &&
@@ -1212,7 +1201,7 @@ Vector2f Text::findCharacterPos( std::size_t index, Font* font, const Uint32& fo
bool bold = ( style & Text::Bold ) != 0; bool bold = ( style & Text::Bold ) != 0;
bool italic = ( style & Italic ) != 0; bool italic = ( style & Italic ) != 0;
Float hspace = static_cast<Float>( Float hspace = static_cast<Float>(
font->getGlyph( L' ', fontSize, bold, italic, outlineThickness ).advance ); font->getGlyphAdvance( L' ', fontSize, bold, italic, outlineThickness ) );
Float vspace = static_cast<Float>( font->getLineSpacing( fontSize ) ); Float vspace = static_cast<Float>( font->getLineSpacing( fontSize ) );
// Compute the position, starting from initialOffset // Compute the position, starting from initialOffset
@@ -1463,7 +1452,7 @@ Int32 Text::findCharacterFromPos( const Vector2i& pos, bool returnNearest, Font*
Vector2f fpos( adjX, adjY ); Vector2f fpos( adjX, adjY );
Float hspace = static_cast<Float>( Float hspace = static_cast<Float>(
font->getGlyph( L' ', fontSize, bold, italic, outlineThickness ).advance ); font->getGlyphAdvance( L' ', fontSize, bold, italic, outlineThickness ) );
#ifdef EE_TEXT_SHAPER_ENABLED #ifdef EE_TEXT_SHAPER_ENABLED
if ( TextShaperEnabled && font->getType() == FontType::TTF && if ( TextShaperEnabled && font->getType() == FontType::TTF &&
src/eepp/ui/css/mediaquery.cpp
-4
View File
@@ -448,8 +448,4 @@ MediaQueryList::MediaQueryList() {
mUsed = false; mUsed = false;
} }
bool MediaQueryList::isUsed() const {
return mUsed;
}
}}} // namespace EE::UI::CSS }}} // namespace EE::UI::CSS
src/eepp/ui/uicodeeditor.cpp
+56 -31
View File
@@ -5206,6 +5206,7 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
Float lineY = rect.Top; Float lineY = rect.Top;
const auto* batchSyntaxType = &SYNTAX_NORMAL; const auto* batchSyntaxType = &SYNTAX_NORMAL;
auto colorSyntaxType = *batchSyntaxType;
Color color = mColorScheme.getSyntaxStyle( *batchSyntaxType ).color; Color color = mColorScheme.getSyntaxStyle( *batchSyntaxType ).color;
color.a *= 0.5f; color.a *= 0.5f;
Float batchWidth = 0; Float batchWidth = 0;
@@ -5213,22 +5214,24 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
Float minimapCutoffX = rect.Left + rect.getWidth(); Float minimapCutoffX = rect.Left + rect.getWidth();
Float widthScale = charSpacing / getGlyphWidth(); Float widthScale = charSpacing / getGlyphWidth();
Int64 maxVisibleColumn = eeceil( rect.getWidth() / charSpacing ); Int64 maxVisibleColumn = eeceil( rect.getWidth() / charSpacing );
auto flushBatch = [this, &color, &batchSyntaxType, &batchStart, &batchWidth, &lineY, &BR, auto flushBatch = [&]() {
&charHeight]( const SyntaxStyleType& type ) { if ( colorSyntaxType != *batchSyntaxType ) {
Color oldColor = color; Color newColor = mColorScheme.getSyntaxStyle( *batchSyntaxType ).color;
color = mColorScheme.getSyntaxStyle( *batchSyntaxType ).color;
if ( color != Color::Transparent ) { if ( newColor != Color::Transparent ) {
color.a *= 0.5f; newColor.a *= 0.5f;
} else { color = newColor;
color = oldColor; }
colorSyntaxType = *batchSyntaxType;
} }
if ( batchWidth > 0 ) { if ( batchWidth <= 0 )
BR->quadsSetColor( color.blendAlpha( mAlpha ) ); return;
BR->batchQuad( { { batchStart, lineY }, { batchWidth, charHeight } } );
} BR->quadsSetColor( color.blendAlpha( mAlpha ) );
BR->batchQuad( { { batchStart, lineY }, { batchWidth, charHeight } } );
batchSyntaxType = &type;
batchStart += batchWidth; batchStart += batchWidth;
batchWidth = 0; batchWidth = 0;
}; };
@@ -5397,7 +5400,7 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
continue; continue;
if ( *batchSyntaxType != token.type ) { if ( *batchSyntaxType != token.type ) {
flushBatch( *batchSyntaxType ); flushBatch();
batchSyntaxType = &token.type; batchSyntaxType = &token.type;
} }
@@ -5412,10 +5415,17 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
for ( auto i = pos; i < maxPos; i++ ) { for ( auto i = pos; i < maxPos; i++ ) {
String::StringBaseType ch = text[i]; String::StringBaseType ch = text[i];
if ( ch == ' ' || ch == '\n' ) { if ( ch == ' ' || ch == '\n' ) {
flushBatch( token.type ); flushBatch();
batchSyntaxType = &token.type;
batchStart += charSpacing; batchStart += charSpacing;
while ( i + 1 < maxPos &&
( text[i + 1] == ' ' || text[i + 1] == '\n' ) ) {
++i;
batchStart += charSpacing;
}
} else if ( ch == '\t' ) { } else if ( ch == '\t' ) {
flushBatch( token.type ); flushBatch();
batchSyntaxType = &token.type;
batchStart += charSpacing * mMinimapConfig.tabWidth; batchStart += charSpacing * mMinimapConfig.tabWidth;
} else { } else {
batchWidth += charSpacing; batchWidth += charSpacing;
@@ -5429,7 +5439,8 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
if ( pos == nextLineCol ) { if ( pos == nextLineCol ) {
if ( curVisualIndex >= minimapStartLine ) { if ( curVisualIndex >= minimapStartLine ) {
flushBatch( token.type ); flushBatch();
batchSyntaxType = &token.type;
lineY += lineSpacing; lineY += lineSpacing;
} }
@@ -5460,7 +5471,7 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
Int64 tokenPos = 0; Int64 tokenPos = 0;
for ( const auto& token : tokens ) { for ( const auto& token : tokens ) {
if ( *batchSyntaxType != token.type ) { if ( *batchSyntaxType != token.type ) {
flushBatch( *batchSyntaxType ); flushBatch();
batchSyntaxType = &token.type; batchSyntaxType = &token.type;
} }
@@ -5469,26 +5480,40 @@ void UICodeEditor::drawMinimap( const Vector2f& start, const DocumentLineRange&,
while ( pos < end ) { while ( pos < end ) {
String::StringBaseType ch = text[pos]; String::StringBaseType ch = text[pos];
if ( ch == ' ' || ch == '\n' ) { if ( ch == ' ' || ch == '\n' ) {
flushBatch( token.type ); flushBatch();
batchStart += charSpacing;
} else if ( ch == '\t' ) { do {
flushBatch( token.type ); batchStart += charSpacing;
batchStart += charSpacing * mMinimapConfig.tabWidth; ++pos;
} else if ( batchStart + batchWidth > minimapCutoffX ) { } while ( pos < end && ( text[pos] == ' ' || text[pos] == '\n' ) );
flushBatch( token.type );
break; continue;
} else {
batchWidth += charSpacing;
} }
pos++;
}; if ( ch == '\t' ) {
flushBatch();
batchStart += charSpacing * mMinimapConfig.tabWidth;
++pos;
continue;
}
if ( batchStart + batchWidth > minimapCutoffX ) {
flushBatch();
break;
}
batchWidth += charSpacing;
++pos;
}
tokenPos += token.len; tokenPos += token.len;
} }
} }
flushBatch( SYNTAX_NORMAL ); flushBatch();
batchSyntaxType = &SYNTAX_NORMAL;
if ( !wrappedLine ) if ( !wrappedLine )
lineY += lineSpacing; lineY += lineSpacing;
src/tools/ecode/plugins/git/gitplugin.hpp
+1 -1
View File
@@ -68,7 +68,7 @@ static constexpr const char* GIT_STASH_TOOLTIP_CLASS = "git-stash-tooltip";
class GitPlugin : public PluginBase { class GitPlugin : public PluginBase {
public: public:
static PluginDefinition Definition() { static PluginDefinition Definition() {
return { "git", "Git", "Git integration", GitPlugin::New, { 0, 1, 5 }, GitPlugin::NewSync }; return { "git", "Git", "Git integration", GitPlugin::New, { 0, 2, 0 }, GitPlugin::NewSync };
} }
static Plugin* New( PluginManager* pluginManager ); static Plugin* New( PluginManager* pluginManager );
src/tools/eeiv/consolecommands.cpp
+4 -4
View File
@@ -235,7 +235,7 @@ void ConsoleCommands::cmdImgResize( const std::vector<String>& params ) {
myPath = params[3].toUtf8(); myPath = params[3].toUtf8();
if ( params.size() > 4 ) { if ( params.size() > 4 ) {
saveType = Image::extensionToSaveType( params[4] ); saveType = Image::extensionToSaveType( params[4].toUtf8() );
} }
if ( params.size() > 5 ) { if ( params.size() > 5 ) {
@@ -274,7 +274,7 @@ void ConsoleCommands::cmdImgThumbnail( const std::vector<String>& params ) {
myPath = params[3].toUtf8(); myPath = params[3].toUtf8();
if ( params.size() > 4 ) { if ( params.size() > 4 ) {
saveType = Image::extensionToSaveType( params[4] ); saveType = Image::extensionToSaveType( params[4].toUtf8() );
} }
} else { } else {
myPath = mApp->getFilePath(); myPath = mApp->getFilePath();
@@ -306,7 +306,7 @@ void ConsoleCommands::cmdImgCenterCrop( const std::vector<String>& params ) {
myPath = params[3].toUtf8(); myPath = params[3].toUtf8();
if ( params.size() > 4 ) { if ( params.size() > 4 ) {
saveType = Image::extensionToSaveType( params[4] ); saveType = Image::extensionToSaveType( params[4].toUtf8() );
} }
} else { } else {
myPath = mApp->getFilePath(); myPath = mApp->getFilePath();
@@ -336,7 +336,7 @@ void ConsoleCommands::cmdImgScale( const std::vector<String>& params ) {
myPath = params[2].toUtf8(); myPath = params[2].toUtf8();
if ( params.size() > 3 ) { if ( params.size() > 3 ) {
saveType = Image::extensionToSaveType( params[3] ); saveType = Image::extensionToSaveType( params[3].toUtf8() );
} }
if ( params.size() > 4 ) { if ( params.size() > 4 ) {