From eef71d50c3685ee5ab74cf7a8aef37ac8515c42a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 5 Apr 2024 20:12:10 +0200 Subject: [PATCH] Android: Unset STRIKE_THRU_TEXT_FLAG for editable settings Because SettingViewHolder is used in RecyclerViews, we have to explicitly unset STRIKE_THRU_TEXT_FLAG when we don't want it, otherwise it might be left over from when the SettingViewHolder was representing a different setting. --- .../features/settings/ui/viewholder/SettingViewHolder.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.kt index 0767840154..2054b08f43 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.kt @@ -28,8 +28,13 @@ abstract class SettingViewHolder(itemView: View, protected val adapter: Settings val overridden = settingsItem.isOverridden textView.setTypeface(null, if (overridden) Typeface.BOLD else Typeface.NORMAL) - if (!settingsItem.isEditable) textView.paintFlags = - textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG + if (settingsItem.isEditable) { + textView.paintFlags = + textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv() + } else { + textView.paintFlags = + textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG + } } /**