fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-25 08:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename the message system's 'data' argument to 'context' (#2872)

Browse Source
This commit is contained in:
Keavon Chambers
2025-07-12 22:50:59 -07:00
committed by GitHub
parent 4c75ddf936
commit 765092fbe9
68 changed files with 674 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/input_mapper/input_mapper_message_handler.rs
+4 -4
View File
@@ -7,7 +7,7 @@ use crate::messages::prelude::*;
use std::fmt::Write;
#[derive(ExtractField)]
pub struct InputMapperMessageData<'a> {
pub struct InputMapperMessageContext<'a> {
pub input: &'a InputPreprocessorMessageHandler,
pub actions: ActionList,
}
@@ -18,9 +18,9 @@ pub struct InputMapperMessageHandler {
}
#[message_handler_data]
impl MessageHandler<InputMapperMessage, InputMapperMessageData<'_>> for InputMapperMessageHandler {
fn process_message(&mut self, message: InputMapperMessage, responses: &mut VecDeque<Message>, data: InputMapperMessageData) {
let InputMapperMessageData { input, actions } = data;
impl MessageHandler<InputMapperMessage, InputMapperMessageContext<'_>> for InputMapperMessageHandler {
fn process_message(&mut self, message: InputMapperMessage, responses: &mut VecDeque<Message>, context: InputMapperMessageContext) {
let InputMapperMessageContext { input, actions } = context;
if let Some(message) = self.mapping.match_input_message(message, &input.keyboard, actions) {
responses.add(message);
editor/src/messages/input_mapper/key_mapping/key_mapping_message_handler.rs
+6 -6
View File
@@ -1,9 +1,9 @@
use crate::messages::input_mapper::input_mapper_message_handler::InputMapperMessageData;
use crate::messages::input_mapper::input_mapper_message_handler::InputMapperMessageContext;
use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
use crate::messages::prelude::*;
#[derive(ExtractField)]
pub struct KeyMappingMessageData<'a> {
pub struct KeyMappingMessageContext<'a> {
pub input: &'a InputPreprocessorMessageHandler,
pub actions: ActionList,
}
@@ -14,12 +14,12 @@ pub struct KeyMappingMessageHandler {
}
#[message_handler_data]
impl MessageHandler<KeyMappingMessage, KeyMappingMessageData<'_>> for KeyMappingMessageHandler {
fn process_message(&mut self, message: KeyMappingMessage, responses: &mut VecDeque<Message>, data: KeyMappingMessageData) {
let KeyMappingMessageData { input, actions } = data;
impl MessageHandler<KeyMappingMessage, KeyMappingMessageContext<'_>> for KeyMappingMessageHandler {
fn process_message(&mut self, message: KeyMappingMessage, responses: &mut VecDeque<Message>, context: KeyMappingMessageContext) {
let KeyMappingMessageContext { input, actions } = context;
match message {
KeyMappingMessage::Lookup(input_message) => self.mapping_handler.process_message(input_message, responses, InputMapperMessageData { input, actions }),
KeyMappingMessage::Lookup(input_message) => self.mapping_handler.process_message(input_message, responses, InputMapperMessageContext { input, actions }),
KeyMappingMessage::ModifyMapping(new_layout) => self.mapping_handler.set_mapping(new_layout.into()),
}
}
editor/src/messages/input_mapper/key_mapping/mod.rs
+1 -1
View File
@@ -4,4 +4,4 @@ mod key_mapping_message_handler;
#[doc(inline)]
pub use key_mapping_message::{KeyMappingMessage, KeyMappingMessageDiscriminant, MappingVariant, MappingVariantDiscriminant};
#[doc(inline)]
pub use key_mapping_message_handler::{KeyMappingMessageData, KeyMappingMessageHandler};
pub use key_mapping_message_handler::{KeyMappingMessageContext, KeyMappingMessageHandler};
editor/src/messages/input_mapper/mod.rs
+1 -1
View File
@@ -8,4 +8,4 @@ pub mod utility_types;
#[doc(inline)]
pub use input_mapper_message::{InputMapperMessage, InputMapperMessageDiscriminant};
#[doc(inline)]
pub use input_mapper_message_handler::{InputMapperMessageData, InputMapperMessageHandler};
pub use input_mapper_message_handler::{InputMapperMessageContext, InputMapperMessageHandler};