From 433c19c1ed27764e0bbc6b0a0486b47d58c54bbd Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Mon, 16 Dec 2024 15:48:24 +0100 Subject: [PATCH] LibWeb: Lay out CommandDefinitions for Editing API a bit nicer No functional changes. --- Libraries/LibWeb/Editing/Commands.cpp | 27 ++++++++++++++++++++++----- Libraries/LibWeb/Editing/Commands.h | 8 ++++---- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Libraries/LibWeb/Editing/Commands.cpp b/Libraries/LibWeb/Editing/Commands.cpp index bd0a415b06c..f521c01c611 100644 --- a/Libraries/LibWeb/Editing/Commands.cpp +++ b/Libraries/LibWeb/Editing/Commands.cpp @@ -781,11 +781,28 @@ bool command_style_with_css_state(DOM::Document const& document) } static Array const commands { - CommandDefinition { CommandNames::delete_, command_delete_action, {}, {}, {} }, - CommandDefinition { CommandNames::defaultParagraphSeparator, command_default_paragraph_separator_action, {}, {}, command_default_paragraph_separator_value }, - CommandDefinition { CommandNames::insertLineBreak, command_insert_linebreak_action, {}, {}, {} }, - CommandDefinition { CommandNames::insertParagraph, command_insert_paragraph_action, {}, {}, {} }, - CommandDefinition { CommandNames::styleWithCSS, command_style_with_css_action, {}, command_style_with_css_state, {} }, + CommandDefinition { + .command = CommandNames::delete_, + .action = command_delete_action, + }, + CommandDefinition { + .command = CommandNames::defaultParagraphSeparator, + .action = command_default_paragraph_separator_action, + .value = command_default_paragraph_separator_value, + }, + CommandDefinition { + .command = CommandNames::insertLineBreak, + .action = command_insert_linebreak_action, + }, + CommandDefinition { + .command = CommandNames::insertParagraph, + .action = command_insert_paragraph_action, + }, + CommandDefinition { + .command = CommandNames::styleWithCSS, + .action = command_style_with_css_action, + .state = command_style_with_css_state, + }, }; Optional find_command_definition(FlyString const& command) diff --git a/Libraries/LibWeb/Editing/Commands.h b/Libraries/LibWeb/Editing/Commands.h index 9dbe90d5ee6..cd4ea394ea6 100644 --- a/Libraries/LibWeb/Editing/Commands.h +++ b/Libraries/LibWeb/Editing/Commands.h @@ -12,10 +12,10 @@ namespace Web::Editing { struct CommandDefinition { FlyString const& command; - Function action; - Function indeterminate; - Function state; - Function value; + Function action {}; + Function indeterminate {}; + Function state {}; + Function value {}; }; Optional find_command_definition(FlyString const&);