RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:57:44 +00:00
Code Issues Activity Actions

LibGfx+Userland: Make TextAttributes::underline_style optional

Browse source 
Rather than having a style AND a field saying whether to use the style,
just make the style Optional.
This commit is contained in:
Sam Atkins 2023-03-15 12:35:00 +00:00 • committed by Andreas Kling
parent 609b616085
commit 6d8f046fd0
10 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/DevTools/HackStudio/Editor.cpp
View file

@ -292,8 +292,8 @@ void Editor::mousemove_event(GUI::MouseEvent& event)
for (auto& span : document().spans()) {
bool is_clickable = (highlighter->is_navigatable(span.data) || highlighter->is_identifier(span.data));
if (span.range.contains(m_previous_text_position) && !span.range.contains(text_position)) {
if (is_clickable && span.attributes.underline) {
span.attributes.underline = false;
if (is_clickable && span.attributes.underline_style.has_value()) {
span.attributes.underline_style.clear();
wrapper().editor().update();
}
}
@ -304,9 +304,12 @@ void Editor::mousemove_event(GUI::MouseEvent& event)
if (is_clickable) {
is_over_clickable = true;
bool was_underlined = span.attributes.underline;
span.attributes.underline = event.modifiers() & Mod_Ctrl;
if (span.attributes.underline != was_underlined) {
bool was_underlined = span.attributes.underline_style.has_value();
bool now_underlined = event.modifiers() & Mod_Ctrl;
span.attributes.underline_style.clear();
if (now_underlined)
span.attributes.underline_style = Gfx::TextAttributes::UnderlineStyle::Solid;
if (now_underlined != was_underlined) {
wrapper().editor().update();
}
}