Skip to content

Commit 2f0a0d5

Browse files
KeavonKeavon
authored
Merge branch 'master' into master
2 parents fd03858 + d7a271f commit 2f0a0d5

File tree

39 files changed

+1612
-774
lines changed

39 files changed

+1612
-774
lines changed

‎editor/src/dispatcher.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ use crate::messages::dialog::DialogMessageData;
33
use crate::messages::portfolio::document::node_graph::document_node_definitions;
44
use crate::messages::prelude::*;
55

6-
use graphene_core::text::Font;
7-
86
#[derive(Debug, Default)]
97
pub struct Dispatcher {
108
buffered_queue: Option<Vec<VecDeque<Message>>>,
@@ -135,10 +133,6 @@ impl Dispatcher {
135133
// Display the menu bar at the top of the window
136134
queue.add(MenuBarMessage::SendLayout);
137135

138-
// Load the default font
139-
let font = Font::new(graphene_core::consts::DEFAULT_FONT_FAMILY.into(), graphene_core::consts::DEFAULT_FONT_STYLE.into());
140-
queue.add(FrontendMessage::TriggerFontLoad { font, is_default: true });
141-
142136
// Send the information for tooltips and categories for each node/input.
143137
queue.add(FrontendMessage::SendUIMetadata {
144138
input_type_descriptions: Vec::new(),

‎editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ impl MessageHandler<NewDocumentDialogMessage, ()> for NewDocumentDialogMessageHa
2525

2626
let create_artboard = !self.infinite && self.dimensions.x > 0 && self.dimensions.y > 0;
2727
if create_artboard {
28+
responses.add(Message::StartBuffer);
2829
responses.add(GraphOperationMessage::NewArtboard {
2930
id: NodeId::new(),
3031
artboard: graphene_core::Artboard::new(IVec2::ZERO, self.dimensions.as_ivec2()),
3132
});
3233
}
3334

34-
responses.add(NodeGraphMessage::RunDocumentGraph);
35-
responses.add(NodeGraphMessage::UpdateNewNodeGraph);
36-
3735
// TODO: Figure out how to get StartBuffer to work here so we can delete this and use `DocumentMessage::ZoomCanvasToFitAll` instead
36+
// Currently, it is necessary to use `FrontendMessage::TriggerDelayedZoomCanvasToFitAll` rather than `DocumentMessage::ZoomCanvasToFitAll` because the size of the viewport is not yet populated
3837
responses.add(Message::StartBuffer);
3938
responses.add(FrontendMessage::TriggerDelayedZoomCanvasToFitAll);
39+
responses.add(DocumentMessage::DeselectAllLayers);
4040
}
4141
}
4242

‎editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -31,64 +31,67 @@ impl PreferencesDialogMessageHandler {
3131
const TITLE: &'static str = "Editor Preferences";
3232

3333
fn layout(&self, preferences: &PreferencesMessageHandler) -> Layout {
34+
let zoom_with_scroll_tooltip = "Use the scroll wheel for zooming instead of vertically panning (not recommended for trackpads)";
35+
let input_section = vec![TextLabel::new("Input").italic(true).widget_holder()];
3436
let zoom_with_scroll = vec![
35-
TextLabel::new("Input").min_width(60).italic(true).widget_holder(),
36-
TextLabel::new("Zoom with Scroll").table_align(true).widget_holder(),
37-
Separator::new(SeparatorType::Unrelated).widget_holder(),
3837
CheckboxInput::new(preferences.zoom_with_scroll)
39-
.tooltip("Use the scroll wheel for zooming instead of vertically panning (not recommended for trackpads)")
38+
.tooltip(zoom_with_scroll_tooltip)
4039
.on_update(|checkbox_input: &CheckboxInput| {
4140
PreferencesMessage::ModifyLayout {
4241
zoom_with_scroll: checkbox_input.checked,
4342
}
4443
.into()
4544
})
4645
.widget_holder(),
46+
Separator::new(SeparatorType::Unrelated).widget_holder(),
47+
TextLabel::new("Zoom with Scroll").table_align(true).tooltip(zoom_with_scroll_tooltip).widget_holder(),
4748
];
4849
let vello_tooltip = "Use the experimental Vello renderer (your browser must support WebGPU)";
50+
let renderer_section = vec![TextLabel::new("Renderer").italic(true).widget_holder()];
4951
let use_vello = vec![
50-
TextLabel::new("Renderer").min_width(60).italic(true).widget_holder(),
51-
TextLabel::new("Vello (Experimental)")
52-
.table_align(true)
53-
.tooltip(vello_tooltip)
54-
.disabled(!preferences.supports_wgpu())
55-
.widget_holder(),
56-
Separator::new(SeparatorType::Unrelated).widget_holder(),
5752
CheckboxInput::new(preferences.use_vello && preferences.supports_wgpu())
5853
.tooltip(vello_tooltip)
5954
.disabled(!preferences.supports_wgpu())
6055
.on_update(|checkbox_input: &CheckboxInput| PreferencesMessage::UseVello { use_vello: checkbox_input.checked }.into())
6156
.widget_holder(),
62-
];
63-
64-
let imaginate_server_hostname = vec![
65-
TextLabel::new("Imaginate").min_width(60).italic(true).widget_holder(),
66-
TextLabel::new("Server Hostname").table_align(true).widget_holder(),
6757
Separator::new(SeparatorType::Unrelated).widget_holder(),
68-
TextInput::new(&preferences.imaginate_server_hostname)
69-
.min_width(200)
70-
.on_update(|text_input: &TextInput| PreferencesMessage::ImaginateServerHostname { hostname: text_input.value.clone() }.into())
58+
TextLabel::new("Vello (Experimental)")
59+
.table_align(true)
60+
.tooltip(vello_tooltip)
61+
.disabled(!preferences.supports_wgpu())
7162
.widget_holder(),
7263
];
7364

74-
let imaginate_refresh_frequency = vec![
75-
TextLabel::new("").min_width(60).widget_holder(),
76-
TextLabel::new("Refresh Frequency").table_align(true).widget_holder(),
77-
Separator::new(SeparatorType::Unrelated).widget_holder(),
78-
NumberInput::new(Some(preferences.imaginate_refresh_frequency))
79-
.unit(" seconds")
80-
.min(0.)
81-
.max((1_u64 << f64::MANTISSA_DIGITS) as f64)
82-
.min_width(200)
83-
.on_update(|number_input: &NumberInput| PreferencesMessage::ImaginateRefreshFrequency { seconds: number_input.value.unwrap() }.into())
84-
.widget_holder(),
85-
];
65+
// TODO: Reenable when Imaginate is restored
66+
// let imaginate_server_hostname = vec![
67+
// TextLabel::new("Imaginate").min_width(60).italic(true).widget_holder(),
68+
// TextLabel::new("Server Hostname").table_align(true).widget_holder(),
69+
// Separator::new(SeparatorType::Unrelated).widget_holder(),
70+
// TextInput::new(&preferences.imaginate_server_hostname)
71+
// .min_width(200)
72+
// .on_update(|text_input: &TextInput| PreferencesMessage::ImaginateServerHostname { hostname: text_input.value.clone() }.into())
73+
// .widget_holder(),
74+
// ];
75+
// let imaginate_refresh_frequency = vec![
76+
// TextLabel::new("").min_width(60).widget_holder(),
77+
// TextLabel::new("Refresh Frequency").table_align(true).widget_holder(),
78+
// Separator::new(SeparatorType::Unrelated).widget_holder(),
79+
// NumberInput::new(Some(preferences.imaginate_refresh_frequency))
80+
// .unit(" seconds")
81+
// .min(0.)
82+
// .max((1_u64 << f64::MANTISSA_DIGITS) as f64)
83+
// .min_width(200)
84+
// .on_update(|number_input: &NumberInput| PreferencesMessage::ImaginateRefreshFrequency { seconds: number_input.value.unwrap() }.into())
85+
// .widget_holder(),
86+
// ];
8687

8788
Layout::WidgetLayout(WidgetLayout::new(vec![
89+
LayoutGroup::Row { widgets: input_section },
8890
LayoutGroup::Row { widgets: zoom_with_scroll },
91+
LayoutGroup::Row { widgets: renderer_section },
8992
LayoutGroup::Row { widgets: use_vello },
90-
LayoutGroup::Row { widgets: imaginate_server_hostname },
91-
LayoutGroup::Row { widgets: imaginate_refresh_frequency },
93+
// LayoutGroup::Row { widgets: imaginate_server_hostname },
94+
// LayoutGroup::Row { widgets: imaginate_refresh_frequency },
9295
]))
9396
}
9497

‎editor/src/messages/frontend/frontend_message.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ pub enum FrontendMessage {
8181
},
8282
TriggerFontLoad {
8383
font: Font,
84-
#[serde(rename = "isDefault")]
85-
is_default: bool,
8684
},
8785
TriggerImport,
8886
TriggerIndexedDbRemoveDocument {
@@ -133,6 +131,10 @@ pub enum FrontendMessage {
133131
UpdateImportsExports {
134132
imports: Vec<(FrontendGraphOutput, i32, i32)>,
135133
exports: Vec<(FrontendGraphInput, i32, i32)>,
134+
#[serde(rename = "addImport")]
135+
add_import: Option<(i32, i32)>,
136+
#[serde(rename = "addExport")]
137+
add_export: Option<(i32, i32)>,
136138
},
137139
UpdateInSelectedNetwork {
138140
#[serde(rename = "inSelectedNetwork")]

‎editor/src/messages/input_mapper/input_mappings.rs

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ pub fn input_mappings() -> Mapping {
7575
entry!(KeyDown(KeyL); modifiers=[Alt], action_dispatch=NodeGraphMessage::ToggleSelectedAsLayersOrNodes),
7676
entry!(KeyDown(KeyC); modifiers=[Shift], action_dispatch=NodeGraphMessage::PrintSelectedNodeCoordinates),
7777
entry!(KeyDown(KeyC); modifiers=[Alt], action_dispatch=NodeGraphMessage::SendClickTargets),
78+
entry!(KeyDown(KeyM); modifiers=[Accel], action_dispatch=NodeGraphMessage::MergeSelectedNodes),
7879
entry!(KeyUp(KeyC); action_dispatch=NodeGraphMessage::EndSendClickTargets),
7980
entry!(KeyDown(ArrowUp); action_dispatch=NodeGraphMessage::ShiftSelectedNodes { direction: Direction::Up, rubber_band: false }),
8081
entry!(KeyDown(ArrowRight); action_dispatch=NodeGraphMessage::ShiftSelectedNodes { direction: Direction::Right, rubber_band: false }),
@@ -109,30 +110,30 @@ pub fn input_mappings() -> Mapping {
109110
entry!(KeyUp(MouseLeft); action_dispatch=ArtboardToolMessage::PointerUp),
110111
entry!(KeyDown(Delete); action_dispatch=ArtboardToolMessage::DeleteSelected),
111112
entry!(KeyDown(Backspace); action_dispatch=ArtboardToolMessage::DeleteSelected),
112-
entry!(KeyDown(ArrowUp); modifiers=[Shift, ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT }),
113-
entry!(KeyDown(ArrowUp); modifiers=[Shift, ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT }),
114-
entry!(KeyDown(ArrowUp); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: -BIG_NUDGE_AMOUNT }),
115-
entry!(KeyDown(ArrowDown); modifiers=[Shift, ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT }),
116-
entry!(KeyDown(ArrowDown); modifiers=[Shift, ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT }),
117-
entry!(KeyDown(ArrowDown); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: BIG_NUDGE_AMOUNT }),
118-
entry!(KeyDown(ArrowLeft); modifiers=[Shift, ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT }),
119-
entry!(KeyDown(ArrowLeft); modifiers=[Shift, ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT }),
120-
entry!(KeyDown(ArrowLeft); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: 0. }),
121-
entry!(KeyDown(ArrowRight); modifiers=[Shift, ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT }),
122-
entry!(KeyDown(ArrowRight); modifiers=[Shift, ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT }),
123-
entry!(KeyDown(ArrowRight); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: 0. }),
124-
entry!(KeyDown(ArrowUp); modifiers=[ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT }),
125-
entry!(KeyDown(ArrowUp); modifiers=[ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT }),
126-
entry!(KeyDown(ArrowUp); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: -NUDGE_AMOUNT }),
127-
entry!(KeyDown(ArrowDown); modifiers=[ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT }),
128-
entry!(KeyDown(ArrowDown); modifiers=[ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT }),
129-
entry!(KeyDown(ArrowDown); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: NUDGE_AMOUNT }),
130-
entry!(KeyDown(ArrowLeft); modifiers=[ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT }),
131-
entry!(KeyDown(ArrowLeft); modifiers=[ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT }),
132-
entry!(KeyDown(ArrowLeft); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: 0. }),
133-
entry!(KeyDown(ArrowRight); modifiers=[ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT }),
134-
entry!(KeyDown(ArrowRight); modifiers=[ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT }),
135-
entry!(KeyDown(ArrowRight); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: 0. }),
113+
entry!(KeyDown(ArrowUp); modifiers=[Shift, ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
114+
entry!(KeyDown(ArrowUp); modifiers=[Shift, ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
115+
entry!(KeyDown(ArrowUp); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: -BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
116+
entry!(KeyDown(ArrowDown); modifiers=[Shift, ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
117+
entry!(KeyDown(ArrowDown); modifiers=[Shift, ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
118+
entry!(KeyDown(ArrowDown); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
119+
entry!(KeyDown(ArrowLeft); modifiers=[Shift, ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
120+
entry!(KeyDown(ArrowLeft); modifiers=[Shift, ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
121+
entry!(KeyDown(ArrowLeft); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -BIG_NUDGE_AMOUNT, delta_y: 0., resize: Alt, resize_opposite_corner: Control }),
122+
entry!(KeyDown(ArrowRight); modifiers=[Shift, ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: -BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
123+
entry!(KeyDown(ArrowRight); modifiers=[Shift, ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: BIG_NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
124+
entry!(KeyDown(ArrowRight); modifiers=[Shift], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: BIG_NUDGE_AMOUNT, delta_y: 0., resize: Alt, resize_opposite_corner: Control }),
125+
entry!(KeyDown(ArrowUp); modifiers=[ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
126+
entry!(KeyDown(ArrowUp); modifiers=[ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
127+
entry!(KeyDown(ArrowUp); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: -NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
128+
entry!(KeyDown(ArrowDown); modifiers=[ArrowLeft], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
129+
entry!(KeyDown(ArrowDown); modifiers=[ArrowRight], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
130+
entry!(KeyDown(ArrowDown); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: 0., delta_y: NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
131+
entry!(KeyDown(ArrowLeft); modifiers=[ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
132+
entry!(KeyDown(ArrowLeft); modifiers=[ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
133+
entry!(KeyDown(ArrowLeft); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: -NUDGE_AMOUNT, delta_y: 0., resize: Alt, resize_opposite_corner: Control }),
134+
entry!(KeyDown(ArrowRight); modifiers=[ArrowUp], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: -NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
135+
entry!(KeyDown(ArrowRight); modifiers=[ArrowDown], action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: NUDGE_AMOUNT, resize: Alt, resize_opposite_corner: Control }),
136+
entry!(KeyDown(ArrowRight); action_dispatch=ArtboardToolMessage::NudgeSelected { delta_x: NUDGE_AMOUNT, delta_y: 0., resize: Alt, resize_opposite_corner: Control }),
136137
entry!(KeyDown(MouseRight); action_dispatch=ArtboardToolMessage::Abort),
137138
entry!(KeyDown(Escape); action_dispatch=ArtboardToolMessage::Abort),
138139
//
@@ -249,7 +250,7 @@ pub fn input_mappings() -> Mapping {
249250
//
250251
// PenToolMessage
251252
entry!(PointerMove; refresh_keys=[Control, Alt, Shift], action_dispatch=PenToolMessage::PointerMove { snap_angle: Shift, break_handle: Alt, lock_angle: Control}),
252-
entry!(KeyDown(MouseLeft); action_dispatch=PenToolMessage::DragStart),
253+
entry!(KeyDown(MouseLeft); action_dispatch=PenToolMessage::DragStart { append_to_selected: Shift }),
253254
entry!(KeyUp(MouseLeft); action_dispatch=PenToolMessage::DragStop),
254255
entry!(KeyDown(MouseRight); action_dispatch=PenToolMessage::Confirm),
255256
entry!(KeyDown(Escape); action_dispatch=PenToolMessage::Confirm),

‎editor/src/messages/layout/layout_message_handler.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ impl LayoutMessageHandler {
189189

190190
responses.add(PortfolioMessage::LoadFont {
191191
font: Font::new(font_family.into(), font_style.into()),
192-
is_default: false,
193192
});
194193
(font_input.on_update.callback)(font_input)
195194
}

0 commit comments

Comments
 (0)