Switch to the widget builder pattern on all remaining layouts (#1346)

* Prefer widget builder pattern

* Nits

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>

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

@@ -1,9 +1,6 @@
 use crate::messages::frontend::utility_types::{ExportBounds, FileType};
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::input_widgets::{CheckboxInput, DropdownEntryData, DropdownInput, NumberInput, RadioEntryData, RadioInput, TextInput};
-use crate::messages::layout::utility_types::widgets::label_widgets::{Separator, SeparatorDirection, SeparatorType, TextLabel};
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 use document_legacy::LayerId;
@@ -47,46 +44,22 @@ impl MessageHandler<ExportDialogMessage, ()> for ExportDialogMessageHandler {
 impl PropertyHolder for ExportDialogMessageHandler {
 	fn properties(&self) -> Layout {
 		let file_name = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "File Name".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::TextInput(TextInput {
-				value: self.file_name.clone(),
-				on_update: WidgetCallback::new(|text_input: &TextInput| ExportDialogMessage::FileName(text_input.value.clone()).into()),
-				..Default::default()
-			})),
+			TextLabel::new("File Name").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			TextInput::new(&self.file_name)
+				.on_update(|text_input: &TextInput| ExportDialogMessage::FileName(text_input.value.clone()).into())
+				.widget_holder(),
 		];
 
 		let entries = [(FileType::Png, "PNG"), (FileType::Jpg, "JPG"), (FileType::Svg, "SVG")]
 			.into_iter()
-			.map(|(val, name)| RadioEntryData {
-				label: name.into(),
-				on_update: WidgetCallback::new(move |_| ExportDialogMessage::FileType(val).into()),
-				..RadioEntryData::default()
-			})
+			.map(|(val, name)| RadioEntryData::new(name).on_update(move |_| ExportDialogMessage::FileType(val).into()))
 			.collect();
 
 		let export_type = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "File Type".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::RadioInput(RadioInput {
-				selected_index: self.file_type as u32,
-				entries,
-				..Default::default()
-			})),
+			TextLabel::new("File Type").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			RadioInput::new(entries).selected_index(self.file_type as u32).widget_holder(),
 		];
 
 		let artboards = self.artboards.iter().map(|(&val, name)| (ExportBounds::Artboard(val), name.to_string(), false));
@@ -98,98 +71,52 @@ impl PropertyHolder for ExportDialogMessageHandler {
 		let index = export_area_options.iter().position(|(val, _, _)| val == &self.bounds).unwrap();
 		let entries = vec![export_area_options
 			.into_iter()
-			.map(|(val, name, disabled)| DropdownEntryData {
-				label: name,
-				on_update: WidgetCallback::new(move |_| ExportDialogMessage::ExportBounds(val).into()),
-				disabled,
-				..Default::default()
-			})
+			.map(|(val, name, disabled)| DropdownEntryData::new(name).on_update(move |_| ExportDialogMessage::ExportBounds(val).into()).disabled(disabled))
 			.collect()];
 
 		let export_area = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Bounds".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::DropdownInput(DropdownInput {
-				selected_index: Some(index as u32),
-				entries,
-				..Default::default()
-			})),
+			TextLabel::new("Bounds").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			DropdownInput::new(entries).selected_index(Some(index as u32)).widget_holder(),
 		];
 
 		let transparent_background = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Transparency".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::CheckboxInput(CheckboxInput {
-				checked: self.transparent_background,
-				disabled: self.file_type == FileType::Jpg,
-				on_update: WidgetCallback::new(move |value: &CheckboxInput| ExportDialogMessage::TransparentBackground(value.checked).into()),
-				..Default::default()
-			})),
+			TextLabel::new("Transparency").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			CheckboxInput::new(self.transparent_background)
+				.disabled(self.file_type == FileType::Jpg)
+				.on_update(move |value: &CheckboxInput| ExportDialogMessage::TransparentBackground(value.checked).into())
+				.widget_holder(),
 		];
 
 		let resolution = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Scale Factor".into(),
-				table_align: true,
-				..TextLabel::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::NumberInput(NumberInput {
-				value: Some(self.scale_factor),
-				label: "".into(),
-				unit: " ".into(),
-				min: Some(0.),
-				disabled: self.file_type == FileType::Svg,
-				on_update: WidgetCallback::new(|number_input: &NumberInput| ExportDialogMessage::ScaleFactor(number_input.value.unwrap()).into()),
-				..NumberInput::default()
-			})),
+			TextLabel::new("Scale Factor").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			NumberInput::new(Some(self.scale_factor))
+				.unit(" ")
+				.min(0.)
+				.disabled(self.file_type == FileType::Svg)
+				.on_update(|number_input: &NumberInput| ExportDialogMessage::ScaleFactor(number_input.value.unwrap()).into())
+				.widget_holder(),
 		];
 
 		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Export".to_string(),
-				min_width: 96,
-				emphasized: true,
-				on_update: WidgetCallback::new(|_| {
+			TextButton::new("Export")
+				.min_width(96)
+				.emphasized(true)
+				.on_update(|_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![ExportDialogMessage::Submit.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Cancel".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-				..Default::default()
-			})),
+				})
+				.widget_holder(),
+			TextButton::new("Cancel").min_width(96).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_holder(),
 		];
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Export".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Export").bold(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: file_name },
 			LayoutGroup::Row { widgets: export_type },

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

@@ -1,8 +1,5 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::input_widgets::{CheckboxInput, NumberInput, TextInput};
-use crate::messages::layout::utility_types::widgets::label_widgets::{Separator, SeparatorDirection, SeparatorType, TextLabel};
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 use graphene_core::uuid::generate_uuid;
@@ -54,103 +51,60 @@ impl MessageHandler<NewDocumentDialogMessage, ()> for NewDocumentDialogMessageHa
 
 impl PropertyHolder for NewDocumentDialogMessageHandler {
 	fn properties(&self) -> Layout {
-		let title = vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-			value: "New document".into(),
-			bold: true,
-			..Default::default()
-		}))];
+		let title = vec![TextLabel::new("New document").bold(true).widget_holder()];
 
 		let name = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Name".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::TextInput(TextInput {
-				value: self.name.clone(),
-				on_update: WidgetCallback::new(|text_input: &TextInput| NewDocumentDialogMessage::Name(text_input.value.clone()).into()),
-				..Default::default()
-			})),
+			TextLabel::new("Name").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			TextInput::new(&self.name)
+				.on_update(|text_input: &TextInput| NewDocumentDialogMessage::Name(text_input.value.clone()).into())
+				.widget_holder(),
 		];
 
 		let infinite = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Infinite Canvas".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::CheckboxInput(CheckboxInput {
-				checked: self.infinite,
-				on_update: WidgetCallback::new(|checkbox_input: &CheckboxInput| NewDocumentDialogMessage::Infinite(checkbox_input.checked).into()),
-				..Default::default()
-			})),
+			TextLabel::new("Infinite Canvas").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			CheckboxInput::new(self.infinite)
+				.on_update(|checkbox_input: &CheckboxInput| NewDocumentDialogMessage::Infinite(checkbox_input.checked).into())
+				.widget_holder(),
 		];
 
 		let scale = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Dimensions".into(),
-				table_align: true,
-				..TextLabel::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::NumberInput(NumberInput {
-				label: "W".into(),
-				unit: " px".into(),
-				value: Some(self.dimensions.x as f64),
-				min: Some(0.),
-				is_integer: true,
-				disabled: self.infinite,
-				min_width: 100,
-				on_update: WidgetCallback::new(|number_input: &NumberInput| NewDocumentDialogMessage::DimensionsX(number_input.value.unwrap()).into()),
-				..NumberInput::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Related,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::NumberInput(NumberInput {
-				label: "H".into(),
-				unit: " px".into(),
-				value: Some(self.dimensions.y as f64),
-				min: Some(0.),
-				is_integer: true,
-				disabled: self.infinite,
-				min_width: 100,
-				on_update: WidgetCallback::new(|number_input: &NumberInput| NewDocumentDialogMessage::DimensionsY(number_input.value.unwrap()).into()),
-				..NumberInput::default()
-			})),
+			TextLabel::new("Dimensions").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			NumberInput::new(Some(self.dimensions.x as f64))
+				.label("W")
+				.unit(" px")
+				.min(0.)
+				.is_integer(true)
+				.disabled(self.infinite)
+				.min_width(100)
+				.on_update(|number_input: &NumberInput| NewDocumentDialogMessage::DimensionsX(number_input.value.unwrap()).into())
+				.widget_holder(),
+			WidgetHolder::related_separator(),
+			NumberInput::new(Some(self.dimensions.y as f64))
+				.label("H")
+				.unit(" px")
+				.min(0.)
+				.is_integer(true)
+				.disabled(self.infinite)
+				.min_width(100)
+				.on_update(|number_input: &NumberInput| NewDocumentDialogMessage::DimensionsY(number_input.value.unwrap()).into())
+				.widget_holder(),
 		];
 
 		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "OK".to_string(),
-				min_width: 96,
-				emphasized: true,
-				on_update: WidgetCallback::new(|_| {
+			TextButton::new("OK")
+				.min_width(96)
+				.emphasized(true)
+				.on_update(|_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![NewDocumentDialogMessage::Submit.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Cancel".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-				..Default::default()
-			})),
+				})
+				.widget_holder(),
+			TextButton::new("Cancel").min_width(96).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_holder(),
 		];
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![

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

@@ -1,8 +1,5 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::input_widgets::{CheckboxInput, NumberInput, TextInput};
-use crate::messages::layout::utility_types::widgets::label_widgets::{Separator, SeparatorDirection, SeparatorType, TextLabel};
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog to allow users to customize Graphite editor options
@@ -31,107 +28,62 @@ impl PreferencesDialogMessageHandler {
 
 	fn properties(&self, preferences: &PreferencesMessageHandler) -> Layout {
 		let zoom_with_scroll = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Input".into(),
-				min_width: 60,
-				italic: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Zoom with Scroll".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::CheckboxInput(CheckboxInput {
-				checked: preferences.zoom_with_scroll,
-				tooltip: "Use the scroll wheel for zooming instead of vertically panning (not recommended for trackpads)".into(),
-				on_update: WidgetCallback::new(|checkbox_input: &CheckboxInput| {
+			TextLabel::new("Input").min_width(60).italic(true).widget_holder(),
+			TextLabel::new("Zoom with Scroll").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			CheckboxInput::new(preferences.zoom_with_scroll)
+				.tooltip("Use the scroll wheel for zooming instead of vertically panning (not recommended for trackpads)")
+				.on_update(|checkbox_input: &CheckboxInput| {
 					PreferencesMessage::ModifyLayout {
 						zoom_with_scroll: checkbox_input.checked,
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
+				})
+				.widget_holder(),
 		];
 
 		let imaginate_server_hostname = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Imaginate".into(),
-				min_width: 60,
-				italic: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Server Hostname".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::TextInput(TextInput {
-				value: preferences.imaginate_server_hostname.clone(),
-				min_width: 200,
-				on_update: WidgetCallback::new(|text_input: &TextInput| PreferencesMessage::ImaginateServerHostname { hostname: text_input.value.clone() }.into()),
-				..Default::default()
-			})),
+			TextLabel::new("Imaginate").min_width(60).italic(true).widget_holder(),
+			TextLabel::new("Server Hostname").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			TextInput::new(&preferences.imaginate_server_hostname)
+				.min_width(200)
+				.on_update(|text_input: &TextInput| PreferencesMessage::ImaginateServerHostname { hostname: text_input.value.clone() }.into())
+				.widget_holder(),
 		];
 
 		let imaginate_refresh_frequency = vec![
-			WidgetHolder::new(Widget::TextLabel(TextLabel { min_width: 60, ..Default::default() })),
-			WidgetHolder::new(Widget::TextLabel(TextLabel {
-				value: "Refresh Frequency".into(),
-				table_align: true,
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::Separator(Separator {
-				separator_type: SeparatorType::Unrelated,
-				direction: SeparatorDirection::Horizontal,
-			})),
-			WidgetHolder::new(Widget::NumberInput(NumberInput {
-				unit: " seconds".into(),
-				value: Some(preferences.imaginate_refresh_frequency),
-				min: Some(0.),
-				min_width: 200,
-				on_update: WidgetCallback::new(|number_input: &NumberInput| PreferencesMessage::ImaginateRefreshFrequency { seconds: number_input.value.unwrap() }.into()),
-				..Default::default()
-			})),
+			TextLabel::new("").min_width(60).widget_holder(),
+			TextLabel::new("Refresh Frequency").table_align(true).widget_holder(),
+			WidgetHolder::unrelated_separator(),
+			NumberInput::new(Some(preferences.imaginate_refresh_frequency))
+				.unit(" seconds")
+				.min(0.)
+				.min_width(200)
+				.on_update(|number_input: &NumberInput| PreferencesMessage::ImaginateRefreshFrequency { seconds: number_input.value.unwrap() }.into())
+				.widget_holder(),
 		];
 
 		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Ok".to_string(),
-				min_width: 96,
-				emphasized: true,
-				on_update: WidgetCallback::new(|_| {
+			TextButton::new("Ok")
+				.min_width(96)
+				.emphasized(true)
+				.on_update(|_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![PreferencesDialogMessage::Confirm.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Reset to Defaults".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| PreferencesMessage::ResetToDefaults.into()),
-				..Default::default()
-			})),
+				})
+				.widget_holder(),
+			TextButton::new("Reset to Defaults")
+				.min_width(96)
+				.on_update(|_| PreferencesMessage::ResetToDefaults.into())
+				.widget_holder(),
 		];
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Editor Preferences".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Editor Preferences").bold(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: zoom_with_scroll },
 			LayoutGroup::Row { widgets: imaginate_server_hostname },

editor/src/messages/dialog/simple_dialogs/about_graphite_dialog.rs

@@ -1,7 +1,5 @@
 use crate::application::{commit_info_localized, release_series};
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog for displaying information on [BuildMetadata] viewable via *Help* > *About Graphite* in the menu bar.
@@ -19,34 +17,17 @@ impl PropertyHolder for AboutGraphiteDialog {
 		];
 		let link_widgets = links
 			.into_iter()
-			.map(|(label, url)| {
-				WidgetHolder::new(Widget::TextButton(TextButton {
-					label: label.to_string(),
-					on_update: WidgetCallback::new(|_| FrontendMessage::TriggerVisitLink { url: url.to_string() }.into()),
-					..Default::default()
-				}))
-			})
+			.map(|(label, url)| TextButton::new(label).on_update(|_| FrontendMessage::TriggerVisitLink { url: url.to_string() }.into()).widget_holder())
 			.collect();
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Graphite".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Graphite".to_string()).bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: release_series(),
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(release_series()).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: commit_info_localized(self.localized_commit_date.as_str()),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(commit_info_localized(&self.localized_commit_date)).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: link_widgets },
 		]))

editor/src/messages/dialog/simple_dialogs/close_all_documents_dialog.rs

@@ -1,6 +1,4 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog for confirming the closing of all documents viewable via `file -> close all` in the menu bar.
@@ -8,42 +6,25 @@ pub struct CloseAllDocumentsDialog;
 
 impl PropertyHolder for CloseAllDocumentsDialog {
 	fn properties(&self) -> Layout {
-		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Discard All".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| {
-					DialogMessage::CloseDialogAndThen {
-						followups: vec![PortfolioMessage::CloseAllDocuments.into()],
-					}
-					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Cancel".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-				..Default::default()
-			})),
-		];
+		let discard = TextButton::new("Discard All")
+			.min_width(96)
+			.on_update(|_| {
+				DialogMessage::CloseDialogAndThen {
+					followups: vec![PortfolioMessage::CloseAllDocuments.into()],
+				}
+				.into()
+			})
+			.widget_holder();
+		let cancel = TextButton::new("Cancel").min_width(96).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_holder();
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Close all documents?".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Close all documents?").multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Unsaved work will be lost!".to_string(),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Unsaved work will be lost!").multiline(true).widget_holder()],
 			},
-			LayoutGroup::Row { widgets: button_widgets },
+			LayoutGroup::Row { widgets: vec![discard, cancel] },
 		]))
 	}
 }

editor/src/messages/dialog/simple_dialogs/close_document_dialog.rs

@@ -1,7 +1,5 @@
 use crate::messages::broadcast::broadcast_event::BroadcastEvent;
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog for confirming the closing a document with unsaved changes.
@@ -15,51 +13,34 @@ impl PropertyHolder for CloseDocumentDialog {
 		let document_id = self.document_id;
 
 		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Save".to_string(),
-				min_width: 96,
-				emphasized: true,
-				on_update: WidgetCallback::new(|_| {
+			TextButton::new("Save")
+				.min_width(96)
+				.emphasized(true)
+				.on_update(|_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![DocumentMessage::SaveDocument.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Discard".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(move |_| {
+				})
+				.widget_holder(),
+			TextButton::new("Discard")
+				.min_width(96)
+				.on_update(move |_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![BroadcastEvent::ToolAbort.into(), PortfolioMessage::CloseDocument { document_id }.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Cancel".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-				..Default::default()
-			})),
+				})
+				.widget_holder(),
+			TextButton::new("Cancel").min_width(96).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_holder(),
 		];
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Save changes before closing?".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Save changes before closing?").bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: self.document_name.clone(),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(&self.document_name).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: button_widgets },
 		]))

editor/src/messages/dialog/simple_dialogs/coming_soon_dialog.rs

@@ -1,6 +1,4 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 use std::fmt::Write;
@@ -13,41 +11,33 @@ pub struct ComingSoonDialog {
 impl PropertyHolder for ComingSoonDialog {
 	fn properties(&self) -> Layout {
 		let mut details = "This feature is not implemented yet".to_string();
-		let mut buttons = vec![WidgetHolder::new(Widget::TextButton(TextButton {
-			label: "OK".to_string(),
-			emphasized: true,
-			min_width: 96,
-			on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-			..Default::default()
-		}))];
+
+		let mut buttons = vec![TextButton::new("OK")
+			.emphasized(true)
+			.min_width(96)
+			.on_update(|_| FrontendMessage::DisplayDialogDismiss.into())
+			.widget_holder()];
+
 		if let Some(issue) = self.issue {
 			let _ = write!(details, "— but you can help add it!\nSee issue #{issue} on GitHub.");
-			buttons.push(WidgetHolder::new(Widget::TextButton(TextButton {
-				label: format!("Issue #{issue}"),
-				min_width: 96,
-				on_update: WidgetCallback::new(move |_| {
-					FrontendMessage::TriggerVisitLink {
-						url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
-					}
-					.into()
-				}),
-				..Default::default()
-			})));
+			buttons.push(
+				TextButton::new(format!("Issue #{issue}"))
+					.min_width(96)
+					.on_update(move |_| {
+						FrontendMessage::TriggerVisitLink {
+							url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
+						}
+						.into()
+					})
+					.widget_holder(),
+			);
 		}
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Coming soon".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Coming soon").bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: details,
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(details).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: buttons },
 		]))

editor/src/messages/dialog/simple_dialogs/error_dialog.rs

@@ -1,6 +1,4 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog to notify users of a non-fatal error.
@@ -13,27 +11,17 @@ impl PropertyHolder for ErrorDialog {
 	fn properties(&self) -> Layout {
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: self.title.clone(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(&self.title).bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: self.description.clone(),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(&self.description).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextButton(TextButton {
-					label: "OK".to_string(),
-					emphasized: true,
-					min_width: 96,
-					on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-					..Default::default()
-				}))],
+				widgets: vec![TextButton::new("OK")
+					.emphasized(true)
+					.min_width(96)
+					.on_update(|_| FrontendMessage::DisplayDialogDismiss.into())
+					.widget_holder()],
 			},
 		]))
 	}