Skip to content

Commit 22aa8c1

Browse files
committed
Update UI widget designs to improve color consistency and add a narrow height mode
1 parent 485152b commit 22aa8c1

Some content is hidden

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

41 files changed

+360
-193
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/layout/layout_message_handler.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,17 @@ impl LayoutMessageHandler {
7979
LayoutGroup::Section { layout, .. } => {
8080
stack.extend(layout.iter().enumerate().map(|(index, val)| ([widget_path.as_slice(), &[index]].concat(), val)));
8181
}
82-
8382
LayoutGroup::Table { rows } => {
84-
for (row_index, cell) in rows.iter().enumerate() {
85-
for (cell_index, entry) in cell.iter().enumerate() {
83+
for (row_index, row) in rows.iter().enumerate() {
84+
for (cell_index, cell) in row.iter().enumerate() {
8685
// Return if this is the correct ID
87-
if entry.widget_id == widget_id {
86+
if cell.widget_id == widget_id {
8887
widget_path.push(row_index);
8988
widget_path.push(cell_index);
90-
return Some((entry, widget_path));
89+
return Some((cell, widget_path));
9190
}
9291

93-
if let Widget::PopoverButton(popover) = &entry.widget {
92+
if let Widget::PopoverButton(popover) = &cell.widget {
9493
stack.extend(
9594
popover
9695
.popover_layout

editor/src/messages/layout/utility_types/widgets/button_widgets.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ pub struct TextButton {
118118

119119
pub disabled: bool,
120120

121+
pub narrow: bool,
122+
121123
pub tooltip: String,
122124

123125
#[serde(skip)]
@@ -179,6 +181,8 @@ pub struct ColorInput {
179181

180182
pub disabled: bool,
181183

184+
pub narrow: bool,
185+
182186
#[serde(rename = "menuDirection")]
183187
pub menu_direction: Option<MenuDirection>,
184188

0 commit comments

Comments
 (0)