Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: lineThrough and underline can coexist

Browse Source
This commit is contained in:
Lucas.Xu 2022-08-09 10:44:00 +08:00
parent 585c9f8753
commit 06d11a91d1
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/rich_text_style.dart
View File

@ -204,12 +204,15 @@ class RichTextStyle {
// underline or strikethrough // underline or strikethrough
TextDecoration get textDecoration { TextDecoration get textDecoration {
var decorations = [TextDecoration.none];
if (attributes.underline || attributes.href != null) { if (attributes.underline || attributes.href != null) {
return TextDecoration.underline; decorations.add(TextDecoration.underline);
} else if (attributes.strikethrough) { // TextDecoration.underline;
return TextDecoration.lineThrough;
} }
return TextDecoration.none; if (attributes.strikethrough) {
decorations.add(TextDecoration.lineThrough);
}
return TextDecoration.combine(decorations);
} }
// font // font

5
frontend/app_flowy/packages/flowy_editor/lib/service/default_text_operations/format_rich_text_style.dart
View File

@ -97,11 +97,6 @@ bool formatRichTextPartialStyle(EditorState editorState, String styleKey) {
Attributes attributes = { Attributes attributes = {
styleKey: value, styleKey: value,
}; };
if (styleKey == StyleKey.underline && value) {
attributes[StyleKey.strikethrough] = null;
} else if (styleKey == StyleKey.strikethrough && value) {
attributes[StyleKey.underline] = null;
}
return formatRichTextStyle(editorState, attributes); return formatRichTextStyle(editorState, attributes);
} }