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

Don't invalidate UITextView setters if same value is passed.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2017-12-16 13:55:16 -03:00
parent 864a1a8aa6
commit 21e2a52c8c
2 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projects/android-project-ant/local.properties
View File

@@ -1,10 +1,12 @@
# This file is automatically generated by Android Tools.
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked in Version Control Systems,
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
# location of the SDK. This is only used by Ant
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Sun Nov 26 15:23:59 ART 2017
ndk.dir=/home/apps/android/sdk/ndk-bundle
sdk.dir=/home/apps/android/sdk

66
src/eepp/ui/uitextview.cpp
View File

@@ -159,16 +159,18 @@ const String& UITextView::getText() {
}
UITextView * UITextView::setText( const String& text ) {
if ( mFlags & UI_WORD_WRAP ) {
mString = text;
mTextCache->setString( mString );
} else {
mTextCache->setString( text );
}
if ( mString != text ) {
if ( mFlags & UI_WORD_WRAP ) {
mString = text;
mTextCache->setString( mString );
} else {
mTextCache->setString( text );
}
recalculate();
onTextChanged();
notifyLayoutAttrChange();
recalculate();
onTextChanged();
notifyLayoutAttrChange();
}
return this;
}
@@ -178,10 +180,12 @@ const Color& UITextView::getFontColor() const {
}
UITextView * UITextView::setFontColor( const Color& color ) {
mFontStyleConfig.FontColor = color;
mTextCache->setFillColor( color );
if ( mFontStyleConfig.FontColor != color ) {
mFontStyleConfig.FontColor = color;
mTextCache->setFillColor( color );
setAlpha( color.a );
setAlpha( color.a );
}
return this;
}
@@ -191,9 +195,12 @@ const Color& UITextView::getFontShadowColor() const {
}
UITextView * UITextView::setFontShadowColor( const Color& color ) {
mFontStyleConfig.ShadowColor = color;
mTextCache->setShadowColor( mFontStyleConfig.ShadowColor );
invalidateDraw();
if ( mFontStyleConfig.ShadowColor != color ) {
mFontStyleConfig.ShadowColor = color;
mTextCache->setShadowColor( mFontStyleConfig.ShadowColor );
invalidateDraw();
}
return this;
}
@@ -202,17 +209,22 @@ const Color& UITextView::getSelectionBackColor() const {
}
UITextView * UITextView::setSelectionBackColor( const Color& color ) {
mFontStyleConfig.FontSelectionBackColor = color;
invalidateDraw();
if ( mFontStyleConfig.FontSelectionBackColor != color ) {
mFontStyleConfig.FontSelectionBackColor = color;
invalidateDraw();
}
return this;
}
void UITextView::setAlpha( const Float& alpha ) {
UIControlAnim::setAlpha( alpha );
mFontStyleConfig.FontColor.a = (Uint8)alpha;
mFontStyleConfig.ShadowColor.a = (Uint8)alpha;
if ( mAlpha != alpha ) {
UIControlAnim::setAlpha( alpha );
mFontStyleConfig.FontColor.a = (Uint8)alpha;
mFontStyleConfig.ShadowColor.a = (Uint8)alpha;
mTextCache->setAlpha( mFontStyleConfig.FontColor.a );
mTextCache->setAlpha( mFontStyleConfig.FontColor.a );
}
}
void UITextView::autoShrink() {
@@ -439,13 +451,17 @@ UITooltipStyleConfig UITextView::getFontStyleConfig() const {
}
void UITextView::selCurInit( const Int32& init ) {
mSelCurInit = init;
invalidateDraw();
if ( mSelCurInit != init ) {
mSelCurInit = init;
invalidateDraw();
}
}
void UITextView::selCurEnd( const Int32& end ) {
mSelCurEnd = end;
invalidateDraw();
if ( mSelCurEnd != end ) {
mSelCurEnd = end;
invalidateDraw();
}
}
Int32 UITextView::selCurInit() {