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

Fix the Brush tool being accessible while disabled in preferences

Browse Source
This commit is contained in:
Keavon Chambers
2025-12-20 03:48:41 -08:00
parent 3000519a10
commit 0a5e65bc9d
5 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/preferences/mod.rs
+1 -1
View File
@@ -1,5 +1,5 @@
mod preferences_message;
mod preferences_message_handler;
pub mod preferences_message_handler;
pub mod utility_types;
#[doc(inline)]
editor/src/messages/preferences/preferences_message_handler.rs
+15 -2
View File
@@ -3,8 +3,14 @@ use crate::messages::input_mapper::key_mapping::MappingVariant;
use crate::messages::portfolio::document::utility_types::wires::GraphWireStyle;
use crate::messages::preferences::SelectionMode;
use crate::messages::prelude::*;
use crate::messages::tool::utility_types::ToolType;
use graph_craft::wasm_application_io::EditorPreferences;
#[derive(ExtractField)]
pub struct PreferencesMessageContext<'a> {
pub tool_message_handler: &'a ToolMessageHandler,
}
#[derive(Debug, PartialEq, Clone, serde::Serialize, serde::Deserialize, specta::Type, ExtractField)]
#[serde(default)]
pub struct PreferencesMessageHandler {
@@ -50,8 +56,10 @@ impl Default for PreferencesMessageHandler {
}
#[message_handler_data]
impl MessageHandler<PreferencesMessage, ()> for PreferencesMessageHandler {
fn process_message(&mut self, message: PreferencesMessage, responses: &mut VecDeque<Message>, _: ()) {
impl MessageHandler<PreferencesMessage, PreferencesMessageContext<'_>> for PreferencesMessageHandler {
fn process_message(&mut self, message: PreferencesMessage, responses: &mut VecDeque<Message>, context: PreferencesMessageContext) {
let PreferencesMessageContext { tool_message_handler } = context;
match message {
// Management messages
PreferencesMessage::Load { preferences } => {
@@ -84,6 +92,11 @@ impl MessageHandler<PreferencesMessage, ()> for PreferencesMessageHandler {
}
PreferencesMessage::BrushTool { enabled } => {
self.brush_tool = enabled;
if !enabled && tool_message_handler.tool_state.tool_data.active_tool_type == ToolType::Brush {
responses.add(ToolMessage::ActivateToolSelect);
}
responses.add(ToolMessage::RefreshToolShelf);
}
PreferencesMessage::ModifyLayout { zoom_with_scroll } => {