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

Make RadioInput accept optional selected_index

Browse Source
This commit is contained in:
Keavon Chambers
2023-09-11 15:40:05 -07:00
parent b29acbd784
commit 88bdf9580f
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/portfolio/document/document_message_handler.rs
+3 -3
View File
@@ -1675,8 +1675,8 @@ impl DocumentMessageHandler {
.on_update(|_| DialogMessage::RequestComingSoonDialog { issue: Some(320) }.into()),
])
.selected_index(match self.view_mode {
ViewMode::Normal => 0,
_ => 1,
ViewMode::Normal => Some(0),
_ => Some(1),
})
.widget_holder(),
PopoverButton::new("View Mode", "Coming soon").widget_holder(),
@@ -1751,7 +1751,7 @@ impl DocumentMessageHandler {
.icon(DocumentMode::GuideMode.icon_name())
.on_update(|_| DialogMessage::RequestComingSoonDialog { issue: Some(331) }.into()),
]])
.selected_index( Some(self.document_mode as u32))
.selected_index(Some(self.document_mode as u32))
.draw_icon( true)
.interactive( false) // TODO: set to true when dialogs are not spawned
.widget_holder(),
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/node_properties.rs
+8 -8
View File
@@ -432,7 +432,7 @@ fn line_cap_widget(document_node: &DocumentNode, node_id: u64, index: usize, nam
widgets.extend_from_slice(&[
Separator::new(SeparatorType::Unrelated).widget_holder(),
RadioInput::new(entries).selected_index(line_cap as u32).widget_holder(),
RadioInput::new(entries).selected_index(Some(line_cap as u32)).widget_holder(),
]);
}
LayoutGroup::Row { widgets }
@@ -452,7 +452,7 @@ fn line_join_widget(document_node: &DocumentNode, node_id: u64, index: usize, na
widgets.extend_from_slice(&[
Separator::new(SeparatorType::Unrelated).widget_holder(),
RadioInput::new(entries).selected_index(line_join as u32).widget_holder(),
RadioInput::new(entries).selected_index(Some(line_join as u32)).widget_holder(),
]);
}
LayoutGroup::Row { widgets }
@@ -474,8 +474,8 @@ fn fill_type_widget(document_node: &DocumentNode, node_id: u64, index: usize) ->
Separator::new(SeparatorType::Unrelated).widget_holder(),
RadioInput::new(entries)
.selected_index(match fill_type {
FillType::None | FillType::Solid => 0,
FillType::Gradient => 1,
FillType::None | FillType::Solid => Some(0),
FillType::Gradient => Some(1),
})
.widget_holder(),
]);
@@ -497,7 +497,7 @@ fn gradient_type_widget(document_node: &DocumentNode, node_id: u64, index: usize
widgets.extend_from_slice(&[
Separator::new(SeparatorType::Unrelated).widget_holder(),
RadioInput::new(entries).selected_index(gradient_type as u32).widget_holder(),
RadioInput::new(entries).selected_index(Some(gradient_type as u32)).widget_holder(),
]);
}
LayoutGroup::Row { widgets }
@@ -899,7 +899,7 @@ pub fn adjust_channel_mixer_properties(document_node: &DocumentNode, node_id: No
RadioEntryData::new(RedGreenBlue::Green.to_string()).on_update(update_value(|_| TaggedValue::RedGreenBlue(RedGreenBlue::Green), node_id, output_channel_index)),
RadioEntryData::new(RedGreenBlue::Blue.to_string()).on_update(update_value(|_| TaggedValue::RedGreenBlue(RedGreenBlue::Blue), node_id, output_channel_index)),
];
output_channel.extend([RadioInput::new(entries).selected_index(choice as u32).widget_holder()]);
output_channel.extend([RadioInput::new(entries).selected_index(Some(choice as u32)).widget_holder()]);
};
let is_output_channel = if let &NodeInput::Value {
tagged_value: TaggedValue::RedGreenBlue(choice),
@@ -1003,7 +1003,7 @@ pub fn adjust_selective_color_properties(document_node: &DocumentNode, node_id:
RadioEntryData::new("Relative").on_update(update_value(|_| TaggedValue::RelativeAbsolute(RelativeAbsolute::Relative), node_id, mode_index)),
RadioEntryData::new("Absolute").on_update(update_value(|_| TaggedValue::RelativeAbsolute(RelativeAbsolute::Absolute), node_id, mode_index)),
];
mode.push(RadioInput::new(entries).selected_index(relative_or_absolute as u32).widget_holder());
mode.push(RadioInput::new(entries).selected_index(Some(relative_or_absolute as u32)).widget_holder());
};
vec![
@@ -1698,7 +1698,7 @@ pub fn imaginate_properties(document_node: &DocumentNode, node_id: NodeId, conte
.map(|(paint, name)| RadioEntryData::new(name).on_update(update_value(move |_| TaggedValue::Bool(paint), node_id, inpaint_index)))
.collect(),
)
.selected_index(1 - in_paint as u32)
.selected_index(Some(1 - in_paint as u32))
.widget_holder(),
]);
}
editor/src/messages/portfolio/document/properties_panel/utility_functions.rs
+3 -3
View File
@@ -472,7 +472,7 @@ fn node_gradient_type(gradient: &Gradient) -> LayoutGroup {
.into()
}),
])
.selected_index(selected_index)
.selected_index(Some(selected_index))
.widget_holder(),
],
}
@@ -777,7 +777,7 @@ fn node_section_stroke(stroke: &Stroke) -> LayoutGroup {
.into()
}),
])
.selected_index(stroke.line_cap_index())
.selected_index(Some(stroke.line_cap_index()))
.widget_holder(),
],
},
@@ -809,7 +809,7 @@ fn node_section_stroke(stroke: &Stroke) -> LayoutGroup {
.into()
}),
])
.selected_index(stroke.line_join_index())
.selected_index(Some(stroke.line_join_index()))
.widget_holder(),
],
},