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

UI refinements for radio buttons and the Snapping/Grid popovers

Browse Source
This commit is contained in:
Keavon Chambers
2024-01-18 05:03:43 -08:00
parent 2df329fc0e
commit 5c9d3c5d75
8 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/layout/utility_types/widgets/input_widgets.rs
+3
View File
@@ -264,6 +264,9 @@ pub struct RadioInput {
// This uses `u32` instead of `usize` since it will be serialized as a normal JS number (replace this with `usize` after switching to a Rust-based GUI)
#[serde(rename = "selectedIndex")]
pub selected_index: Option<u32>,
#[serde(rename = "minWidth")]
pub min_width: u32,
}
#[derive(Clone, Default, Derivative, Serialize, Deserialize, WidgetBuilder, specta::Type)]
editor/src/messages/portfolio/document/document_message_handler.rs
+2 -5
View File
@@ -1168,8 +1168,6 @@ impl DocumentMessageHandler {
.options_widget(vec![
LayoutGroup::Row {
widgets: vec![
TextLabel::new(SnappingOptions::BoundingBoxes.to_string()).table_align(true).min_width(96).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
CheckboxInput::new(snapping_state.bounding_box_snapping)
.tooltip(SnappingOptions::BoundingBoxes.to_string())
.on_update(move |input: &CheckboxInput| {
@@ -1181,13 +1179,11 @@ impl DocumentMessageHandler {
.into()
})
.widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
TextLabel::new(SnappingOptions::BoundingBoxes.to_string()).widget_holder(),
],
},
LayoutGroup::Row {
widgets: vec![
TextLabel::new(SnappingOptions::Geometry.to_string()).table_align(true).min_width(96).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
CheckboxInput::new(self.snapping_state.geometry_snapping)
.tooltip(SnappingOptions::Geometry.to_string())
.on_update(|input: &CheckboxInput| {
@@ -1199,6 +1195,7 @@ impl DocumentMessageHandler {
.into()
})
.widget_holder(),
TextLabel::new(SnappingOptions::Geometry.to_string()).widget_holder(),
],
},
])
editor/src/messages/portfolio/document/overlays/grid_overlays.rs
+10 -15
View File
@@ -108,7 +108,7 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
widgets.push(LayoutGroup::Row {
widgets: vec![
TextLabel::new("Origin").table_align(true).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
Separator::new(SeparatorType::Unrelated).widget_holder(),
NumberInput::new(Some(grid.origin.x))
.label("X")
.unit(" px")
@@ -127,11 +127,12 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
widgets.push(LayoutGroup::Row {
widgets: vec![
TextLabel::new("Type").table_align(true).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
Separator::new(SeparatorType::Unrelated).widget_holder(),
RadioInput::new(vec![
RadioEntryData::new("Rectangular").on_update(update_val(grid, |grid, _| grid.grid_type = GridType::RECTANGLE)),
RadioEntryData::new("Isometric").on_update(update_val(grid, |grid, _| grid.grid_type = GridType::ISOMETRIC)),
])
.min_width(200)
.selected_index(Some(if matches!(grid.grid_type, GridType::Rectangle { .. }) { 0 } else { 1 }))
.widget_holder(),
],
@@ -141,7 +142,7 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
GridType::Rectangle { spacing } => widgets.push(LayoutGroup::Row {
widgets: vec![
TextLabel::new("Spacing").table_align(true).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
Separator::new(SeparatorType::Unrelated).widget_holder(),
NumberInput::new(Some(spacing.x))
.label("X")
.unit(" px")
@@ -162,10 +163,9 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
GridType::Isometric { y_axis_spacing, angle_a, angle_b } => {
widgets.push(LayoutGroup::Row {
widgets: vec![
TextLabel::new("Spacing").table_align(true).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
TextLabel::new("Y Spacing").table_align(true).widget_holder(),
Separator::new(SeparatorType::Unrelated).widget_holder(),
NumberInput::new(Some(y_axis_spacing))
.label("Y")
.unit(" px")
.min(0.)
.min_width(200)
@@ -175,22 +175,17 @@ pub fn overlay_options(grid: &GridSnapping) -> Vec<LayoutGroup> {
});
widgets.push(LayoutGroup::Row {
widgets: vec![
TextLabel::new("Angle A").table_align(true).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
TextLabel::new("Angles").table_align(true).widget_holder(),
Separator::new(SeparatorType::Unrelated).widget_holder(),
NumberInput::new(Some(angle_a))
.unit("°")
.min_width(200)
.min_width(98)
.on_update(update_origin(&grid, |grid| grid.grid_type.angle_a()))
.widget_holder(),
],
});
widgets.push(LayoutGroup::Row {
widgets: vec![
TextLabel::new("Angle B").table_align(true).widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
NumberInput::new(Some(angle_b))
.unit("°")
.min_width(200)
.min_width(98)
.on_update(update_origin(&grid, |grid| grid.grid_type.angle_b()))
.widget_holder(),
],
editor/src/messages/portfolio/portfolio_message_handler.rs
+1
View File
@@ -487,6 +487,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
responses.add(DocumentMessage::RenderRulers);
responses.add(MenuBarMessage::SendLayout);
responses.add(FrontendMessage::TriggerRefreshBoundsOfViewports);
}
}
PortfolioMessage::UpdateDocumentWidgets => {