test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-06 14:17:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix TextView::setTextColor(nullptr)'s crash

Browse Source
This commit is contained in:
houzh 2023-11-27 14:21:15 +08:00
parent d12baaa580
commit 947ea9d34b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/widget/textview.cc
View File

@ -1583,17 +1583,17 @@ void TextView::invalidateDrawable(Drawable& drawable){
void TextView::updateTextColors(){
bool inval = false;
const std::vector<int>&drawableState = getDrawableState();
int color = mTextColor->getColorForState(drawableState,0);
if (color != mCurTextColor) {
if (mCurTextColor) {
const int color = mTextColor->getColorForState(drawableState,0);
LOGV("%p:%d change color %x->%x",this,mID,color,mCurTextColor);
mCurTextColor = color;
inval = true;
}
if (mLinkTextColor != nullptr) {
if (mLinkTextColor) {
color = mLinkTextColor->getColorForState(drawableState,0);
inval = true;
}
if (mHintTextColor != nullptr) {
if (mHintTextColor) {
color = mHintTextColor->getColorForState(drawableState,0);
if (color != mCurHintTextColor) {
mCurHintTextColor = color;
@ -1632,9 +1632,8 @@ void TextView::setEllipsize(int where){
}
void TextView::setTextColor(int color){
delete mTextColor;
mTextColor = ColorStateList::valueOf(color);
updateTextColors();
ColorStateList cls(color);
setTextColor(&cls);
}
void TextView::setTextColor(const ColorStateList* colors){