Integrate Stable Diffusion with the Imaginate layer (#784)

* Add AI Artist layer * WIP add a button to download the rendered folder under an AI Artist layer * Successfully download the correct image * Break out image downloading JS into helper function * Change file download from using data URLs to blob URLs * WIP rasterize to blob * Remove dimensions from AI Artist layer * Successfully draw rasterized image on layer after calculation * Working txt2img generation based on user prompt * Add img2img and the main parameters * Fix ability to rasterize multi-depth documents with blob URL images by switching them to base64 * Fix test * Rasterize with artboard background color * Allow aspect ratio stretch of AI Artist images * Add automatic resolution choosing * Add a terminate button, and make the lifecycle more robust * Add negative prompt * Add range bounds for parameter inputs * Add seed * Add tiling and restore faces * Add server status check, server hostname customization, and resizing layer to fit AI Artist resolution * Fix background color of infinite canvas rasterization * Escape prompt text sent in the JSON * Revoke blob URLs when cleared/replaced to reduce memory leak * Fix welcome screen logo color * Add PreferencesMessageHandler * Add persistent storage of preferences * Fix crash introduced in previous commit when moving mouse on page load * Add tooltips to the AI Artist layer properties * Integrate AI Artist tool into the raster section of the tool shelf * Add a refresh button to the connection status * Fix crash when generating and switching to a different document tab * Add persistent image storage to AI Artist layers and fix duplication bugs * Add a generate with random seed button * Simplify and standardize message names * Majorly improve robustness of networking code * Fix race condition causing default server hostname to show disconnected when app loads with AI Artist layer selected (probably, not confirmed fixed) * Clean up messages and function calls by changing arguments into structs * Update API to more recent server commit * Add support for picking the sampling method * Add machinery for filtering selected layers with type * Replace placeholder button icons * Improve the random icon by tilting the dice * Use selected_layers() instead of repeating that code * Fix borrow error * Change message flow in progress towards fixing #797 * Allow loading image on non-active document (fixes #797) * Reduce code duplication with rasterization * Add AI Artist tool and layer icons, and remove ugly node layer icon style * Rename "AI Artist" codename to "Imaginate" feature name Co-authored-by: otdavies <oliver@psyfer.io> Co-authored-by: 0hypercube <0hypercube@gmail.com>
2026-09-28 11:58:12 +08:00 · 2022-10-18 22:33:27 -07:00
parent 06acd45a81
commit 30719bdc72
118 changed files with 3767 additions and 678 deletions
@@ -63,7 +63,20 @@ impl Layout {
 					Widget::ColorInput(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
 					Widget::IconButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
 					Widget::OptionalInput(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
-					_ => None,
+					Widget::DropdownInput(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
+					Widget::FontInput(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
+					Widget::NumberInput(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
+					Widget::PopoverButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
+					Widget::TextButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
+					Widget::IconLabel(_)
+					| Widget::InvisibleStandinInput(_)
+					| Widget::PivotAssist(_)
+					| Widget::RadioInput(_)
+					| Widget::Separator(_)
+					| Widget::SwatchPairInput(_)
+					| Widget::TextAreaInput(_)
+					| Widget::TextInput(_)
+					| Widget::TextLabel(_) => None,
 				};
 				if let Some((tooltip, Some(tooltip_shortcut))) = &mut tooltip_shortcut {
 					apply_shortcut_to_tooltip(tooltip_shortcut, tooltip);
@@ -1,9 +1,9 @@
+use crate::messages::layout::utility_types::layout_widget::WidgetCallback;
+
 use derivative::*;
 use glam::DVec2;
 use serde::{Deserialize, Serialize};

-use crate::messages::layout::utility_types::layout_widget::WidgetCallback;
-
 #[derive(Clone, Default, Derivative, Serialize, Deserialize)]
 #[derivative(Debug, PartialEq)]
 pub struct PivotAssist {
@@ -33,6 +33,11 @@ pub struct PopoverButton {
 	pub header: String,

 	pub text: String,
+
+	pub tooltip: String,
+
+	#[serde(skip)]
+	pub tooltip_shortcut: Option<ActionKeys>,
 }

 #[derive(Clone, Serialize, Deserialize, Derivative, Default)]
@@ -50,6 +55,11 @@ pub struct TextButton {

 	pub disabled: bool,

+	pub tooltip: String,
+
+	#[serde(skip)]
+	pub tooltip_shortcut: Option<ActionKeys>,
+
 	// Callbacks
 	#[serde(skip)]
 	#[derivative(Debug = "ignore", PartialEq = "ignore")]
@@ -6,7 +6,7 @@ use graphene::color::Color;
 use derivative::*;
 use serde::{Deserialize, Serialize};

-#[derive(Clone, Default, Derivative, Serialize, Deserialize)]
+#[derive(Clone, Derivative, Serialize, Deserialize)]
 #[derivative(Debug, PartialEq)]
 pub struct CheckboxInput {
 	pub checked: bool,
@@ -24,6 +24,18 @@ pub struct CheckboxInput {
 	pub on_update: WidgetCallback<CheckboxInput>,
 }

+impl Default for CheckboxInput {
+	fn default() -> Self {
+		Self {
+			checked: false,
+			icon: "Checkmark".into(),
+			tooltip: Default::default(),
+			tooltip_shortcut: Default::default(),
+			on_update: Default::default(),
+		}
+	}
+}
+
 #[derive(Clone, Derivative, Serialize, Deserialize)]
 #[derivative(Debug, PartialEq, Default)]
 pub struct ColorInput {
@@ -64,6 +76,11 @@ pub struct DropdownInput {
 	pub interactive: bool,

 	pub disabled: bool,
+
+	pub tooltip: String,
+
+	#[serde(skip)]
+	pub tooltip_shortcut: Option<ActionKeys>,
 	//
 	// Callbacks
 	// `on_update` exists on the `DropdownEntryData`, not this parent `DropdownInput`
@@ -109,6 +126,11 @@ pub struct FontInput {

 	pub disabled: bool,

+	pub tooltip: String,
+
+	#[serde(skip)]
+	pub tooltip_shortcut: Option<ActionKeys>,
+
 	// Callbacks
 	#[serde(skip)]
 	#[derivative(Debug = "ignore", PartialEq = "ignore")]
@@ -159,11 +181,15 @@ pub struct NumberInput {

 	pub disabled: bool,

-	// Callbacks
-	#[serde(skip)]
-	#[derivative(Debug = "ignore", PartialEq = "ignore")]
-	pub on_update: WidgetCallback<NumberInput>,
+	#[serde(rename = "minWidth")]
+	pub min_width: u32,

+	pub tooltip: String,
+
+	#[serde(skip)]
+	pub tooltip_shortcut: Option<ActionKeys>,
+
+	// Callbacks
 	#[serde(skip)]
 	#[derivative(Debug = "ignore", PartialEq = "ignore")]
 	pub increment_callback_increase: WidgetCallback<NumberInput>,
@@ -171,6 +197,10 @@ pub struct NumberInput {
 	#[serde(skip)]
 	#[derivative(Debug = "ignore", PartialEq = "ignore")]
 	pub increment_callback_decrease: WidgetCallback<NumberInput>,
+
+	#[serde(skip)]
+	#[derivative(Debug = "ignore", PartialEq = "ignore")]
+	pub on_update: WidgetCallback<NumberInput>,
 }

 #[derive(Clone, Serialize, Deserialize, Debug, Default, PartialEq, Eq)]
@@ -246,6 +276,8 @@ pub struct TextAreaInput {

 	pub disabled: bool,

+	pub tooltip: String,
+
 	// Callbacks
 	#[serde(skip)]
 	#[derivative(Debug = "ignore", PartialEq = "ignore")]
@@ -261,6 +293,11 @@ pub struct TextInput {

 	pub disabled: bool,

+	pub tooltip: String,
+
+	#[serde(rename = "minWidth")]
+	pub min_width: u32,
+
 	// Callbacks
 	#[serde(skip)]
 	#[derivative(Debug = "ignore", PartialEq = "ignore")]
@@ -5,15 +5,7 @@ use serde::{Deserialize, Serialize};
 pub struct IconLabel {
 	pub icon: String,

-	#[serde(rename = "iconStyle")]
-	pub icon_style: IconStyle,
-}
-
-#[derive(Clone, Serialize, Deserialize, Derivative, Debug, Default, PartialEq, Eq)]
-pub enum IconStyle {
-	#[default]
-	Normal,
-	Node,
+	pub tooltip: String,
 }

 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -49,6 +41,11 @@ pub struct TextLabel {

 	pub multiline: bool,

+	#[serde(rename = "minWidth")]
+	pub min_width: u32,
+
+	pub tooltip: String,
+
 	// Body
 	pub value: String,
 }