Skip to content

Commit 5440f96

Browse files
0HyperCube0HyperCube
committed
Remove update_dynamic_hints seperate function
1 parent 4421d04 commit 5440f96

File tree

15 files changed

+336
-358
lines changed

15 files changed

+336
-358
lines changed

‎editor/src/messages/tool/common_functionality/shape_editor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ impl ShapeState {
15961596
}
15971597

15981598
pub fn find_nearest_visible_point_indices(
1599-
&mut self,
1599+
&self,
16001600
network_interface: &NodeNetworkInterface,
16011601
mouse_position: DVec2,
16021602
select_threshold: f64,

‎editor/src/messages/tool/tool_messages/artboard_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ impl Fsm for ArtboardToolFsmState {
528528
}
529529
}
530530

531-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
531+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
532532
let hint_data = match self {
533533
ArtboardToolFsmState::Ready { .. } => HintData(vec![
534534
HintGroup(vec![HintInfo::mouse(MouseMotion::LmbDrag, "Draw Artboard")]),
@@ -552,7 +552,7 @@ impl Fsm for ArtboardToolFsmState {
552552
responses.add(FrontendMessage::UpdateInputHints { hint_data });
553553
}
554554

555-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
555+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
556556
if let Self::Ready { hovered: false } = self {
557557
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Crosshair });
558558
} else {

‎editor/src/messages/tool/tool_messages/brush_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ impl Fsm for BrushToolFsmState {
418418
}
419419
}
420420

421-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
421+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
422422
let hint_data = match self {
423423
BrushToolFsmState::Ready => HintData(vec![
424424
HintGroup(vec![HintInfo::mouse(MouseMotion::LmbDrag, "Draw")]),
@@ -430,7 +430,7 @@ impl Fsm for BrushToolFsmState {
430430
responses.add(FrontendMessage::UpdateInputHints { hint_data });
431431
}
432432

433-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
433+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
434434
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
435435
}
436436
}

‎editor/src/messages/tool/tool_messages/eyedropper_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl Fsm for EyedropperToolFsmState {
124124
}
125125
}
126126

127-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
127+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
128128
let hint_data = match self {
129129
EyedropperToolFsmState::Ready => HintData(vec![HintGroup(vec![
130130
HintInfo::mouse(MouseMotion::Lmb, "Sample to Primary"),
@@ -138,7 +138,7 @@ impl Fsm for EyedropperToolFsmState {
138138
responses.add(FrontendMessage::UpdateInputHints { hint_data });
139139
}
140140

141-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
141+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
142142
let cursor = match *self {
143143
EyedropperToolFsmState::Ready => MouseCursorIcon::Default,
144144
EyedropperToolFsmState::SamplingPrimary | EyedropperToolFsmState::SamplingSecondary => MouseCursorIcon::None,

‎editor/src/messages/tool/tool_messages/fill_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl Fsm for FillToolFsmState {
145145
}
146146
}
147147

148-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
148+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
149149
let hint_data = match self {
150150
FillToolFsmState::Ready => HintData(vec![HintGroup(vec![
151151
HintInfo::mouse(MouseMotion::Lmb, "Fill with Primary"),
@@ -157,7 +157,7 @@ impl Fsm for FillToolFsmState {
157157
responses.add(FrontendMessage::UpdateInputHints { hint_data });
158158
}
159159

160-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
160+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
161161
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
162162
}
163163
}

‎editor/src/messages/tool/tool_messages/freehand_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl Fsm for FreehandToolFsmState {
297297
}
298298
}
299299

300-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
300+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
301301
let hint_data = match self {
302302
FreehandToolFsmState::Ready => HintData(vec![HintGroup(vec![
303303
HintInfo::mouse(MouseMotion::LmbDrag, "Draw Polyline"),
@@ -310,7 +310,7 @@ impl Fsm for FreehandToolFsmState {
310310
responses.add(FrontendMessage::UpdateInputHints { hint_data });
311311
}
312312

313-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
313+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
314314
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
315315
}
316316
}

‎editor/src/messages/tool/tool_messages/gradient_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ impl Fsm for GradientToolFsmState {
519519
}
520520
}
521521

522-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
522+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
523523
let hint_data = match self {
524524
GradientToolFsmState::Ready => HintData(vec![HintGroup(vec![
525525
HintInfo::mouse(MouseMotion::LmbDrag, "Draw Gradient"),
@@ -534,7 +534,7 @@ impl Fsm for GradientToolFsmState {
534534
responses.add(FrontendMessage::UpdateInputHints { hint_data });
535535
}
536536

537-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
537+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
538538
responses.add(FrontendMessage::UpdateMouseCursor { cursor: MouseCursorIcon::Default });
539539
}
540540
}

‎editor/src/messages/tool/tool_messages/navigate_tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl Fsm for NavigateToolFsmState {
145145
}
146146
}
147147

148-
fn update_hints(&self, responses: &mut VecDeque<Message>) {
148+
fn update_hints(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
149149
let hint_data = match self {
150150
NavigateToolFsmState::Ready | NavigateToolFsmState::ZoomOrClickZooming => HintData(vec![
151151
HintGroup(vec![
@@ -169,7 +169,7 @@ impl Fsm for NavigateToolFsmState {
169169
responses.add(FrontendMessage::UpdateInputHints { hint_data });
170170
}
171171

172-
fn update_cursor(&self, responses: &mut VecDeque<Message>) {
172+
fn update_cursor(&self, _: &Self::ToolData, _: &ToolActionMessageContext, _: &Self::ToolOptions, responses: &mut VecDeque<Message>) {
173173
let cursor = match *self {
174174
NavigateToolFsmState::Ready => MouseCursorIcon::ZoomIn,
175175
NavigateToolFsmState::Tilting => MouseCursorIcon::Default,

0 commit comments

Comments
 (0)