Skip to content

Commit 0f63831

Browse files
authored
Rename the Group type to Graphic everywhere (#3009)
1 parent 309a643 commit 0f63831

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+267
-277
lines changed

demo-artwork/changing-seasons.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/isometric-fountain.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/marbled-mandelbrot.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/painted-dreams.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,19 @@ impl LayoutHolder for ExportDialogMessageHandler {
111111
(ExportBounds::Selection, "Selection".to_string(), !self.has_selection),
112112
];
113113
let artboards = self.artboards.iter().map(|(&layer, name)| (ExportBounds::Artboard(layer), name.to_string(), false)).collect();
114-
let groups = [standard_bounds, artboards];
114+
let choices = [standard_bounds, artboards];
115115

116116
let current_bounds = if !self.has_selection && self.bounds == ExportBounds::Selection {
117117
ExportBounds::AllArtwork
118118
} else {
119119
self.bounds
120120
};
121-
let index = groups.iter().flatten().position(|(bounds, _, _)| *bounds == current_bounds).unwrap();
121+
let index = choices.iter().flatten().position(|(bounds, _, _)| *bounds == current_bounds).unwrap();
122122

123-
let mut entries = groups
123+
let mut entries = choices
124124
.into_iter()
125-
.map(|group| {
126-
group
125+
.map(|choice| {
126+
choice
127127
.into_iter()
128128
.map(|(val, name, disabled)| {
129129
MenuListEntry::new(format!("{val:?}"))

editor/src/messages/layout/layout_message_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ impl LayoutMessageHandler {
5959
/// Get the widget path for the widget with the specified id
6060
fn get_widget_path(widget_layout: &WidgetLayout, widget_id: WidgetId) -> Option<(&WidgetHolder, Vec<usize>)> {
6161
let mut stack = widget_layout.layout.iter().enumerate().map(|(index, val)| (vec![index], val)).collect::<Vec<_>>();
62-
while let Some((mut widget_path, group)) = stack.pop() {
63-
match group {
62+
while let Some((mut widget_path, layout_group)) = stack.pop() {
63+
match layout_group {
6464
// Check if any of the widgets in the current column or row have the correct id
6565
LayoutGroup::Column { widgets } | LayoutGroup::Row { widgets } => {
6666
for (index, widget) in widgets.iter().enumerate() {

0 commit comments

Comments
 (0)