jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change eyedropper to use correct message (#327)

This commit is contained in:
Henry Sloan 2021-08-03 16:35:26 -04:00 committed by Keavon Chambers
parent 7afb28b995
commit ea01c71421
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/editor/src/tool/tools/eyedropper.rs
View File

@ -1,5 +1,4 @@
use crate::consts::SELECTION_TOLERANCE; use crate::consts::SELECTION_TOLERANCE;
use crate::frontend::FrontendMessage;
use crate::message_prelude::*; use crate::message_prelude::*;
use crate::tool::{ToolActionHandlerData, ToolMessage}; use crate::tool::{ToolActionHandlerData, ToolMessage};
use glam::DVec2; use glam::DVec2;
@ -32,14 +31,11 @@ impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Eyedropper {
if let Some(path) = data.0.document.intersects_quad_root(quad).last() { if let Some(path) = data.0.document.intersects_quad_root(quad).last() {
if let Ok(layer) = data.0.document.layer(path) { if let Ok(layer) = data.0.document.layer(path) {
if let Some(fill) = layer.style.fill() { if let Some(color) = layer.style.fill().and_then(|fill| fill.color()) {
if let Some(color) = fill.color() { match action {
let (primary, secondary) = match action { ToolMessage::Eyedropper(EyedropperMessage::LeftMouseDown) => responses.push_back(ToolMessage::SelectPrimaryColor(color).into()),
ToolMessage::Eyedropper(EyedropperMessage::LeftMouseDown) => (color, data.1.secondary_color), ToolMessage::Eyedropper(EyedropperMessage::RightMouseDown) => responses.push_back(ToolMessage::SelectSecondaryColor(color).into()),
ToolMessage::Eyedropper(EyedropperMessage::RightMouseDown) => (data.1.primary_color, color), _ => {}
_ => (data.1.primary_color, data.1.secondary_color),
};
responses.push_back(FrontendMessage::UpdateWorkingColors { primary, secondary }.into());
} }
} }
} }