From 5dad97779afaad0176d1b46ed70d03d6e9ca54df Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 12 Sep 2023 07:34:42 -0600
Subject: [PATCH] WIP

---
 Cargo.lock                          | 1 +
 crates/gpui2/src/style.rs           | 2 ++
 crates/refineable/src/refineable.rs | 6 ++++++
 crates/storybook/Cargo.toml         | 1 +
 crates/storybook/build.rs           | 5 +++++
 5 files changed, 15 insertions(+)
 create mode 100644 crates/storybook/build.rs

diff --git a/Cargo.lock b/Cargo.lock
index 775e1d2b8e..6cf5d23d57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7378,6 +7378,7 @@ dependencies = [
  "anyhow",
  "gpui2",
  "log",
+ "refineable",
  "rust-embed",
  "serde",
  "settings",
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index e3e0f5b0c4..7cd497e85c 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -22,6 +22,8 @@ use gpui2_macros::styleable_helpers;
 use refineable::{Refineable, RefinementCascade};
 use std::sync::Arc;
 
+pub type StyleCascade = RefinementCascade<Style>;
+
 #[derive(Clone, Refineable, Debug)]
 #[refineable(debug)]
 pub struct Style {
diff --git a/crates/refineable/src/refineable.rs b/crates/refineable/src/refineable.rs
index 1223622f3c..1ce42f9f17 100644
--- a/crates/refineable/src/refineable.rs
+++ b/crates/refineable/src/refineable.rs
@@ -17,6 +17,12 @@ pub trait Refineable: Clone {
     {
         Self::default().refined(refinement)
     }
+    fn from_cascade(cascade: &RefinementCascade<Self>) -> Self
+    where
+        Self: Default + Sized,
+    {
+        Self::default().refined(&cascade.merged())
+    }
 }
 
 pub struct RefinementCascade<S: Refineable>(Vec<Option<S::Refinement>>);
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
index f634ea4eca..53b05100ef 100644
--- a/crates/storybook/Cargo.toml
+++ b/crates/storybook/Cargo.toml
@@ -12,6 +12,7 @@ path = "src/storybook.rs"
 gpui2 = { path = "../gpui2" }
 anyhow.workspace = true
 log.workspace = true
+refineable = { path = "../refineable" }
 rust-embed.workspace = true
 serde.workspace = true
 settings = { path = "../settings" }
diff --git a/crates/storybook/build.rs b/crates/storybook/build.rs
new file mode 100644
index 0000000000..94602ec073
--- /dev/null
+++ b/crates/storybook/build.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // Find WebRTC.framework as a sibling of the executable when running outside of an application bundle.
+    // TODO: We shouldn't depend on WebRTC in editor
+    println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
+}