From 9873bef591b88199da8fb1e015933ac71f999cfe Mon Sep 17 00:00:00 2001
From: noxware <7684329+noxware@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:10:15 -0300
Subject: [PATCH 1/3] use toggle panel from makepad

---
 Cargo.lock                 |  62 ++++----
 Cargo.toml                 |   8 +-
 src/chat/chat_history.rs   |   6 +-
 src/chat/chat_params.rs    |  10 +-
 src/shared/mod.rs          |   2 -
 src/shared/toggle_panel.rs | 286 -------------------------------------
 src/shared/widgets.rs      |  29 ++++
 7 files changed, 69 insertions(+), 334 deletions(-)
 delete mode 100644 src/shared/toggle_panel.rs

diff --git a/Cargo.lock b/Cargo.lock
index bcc940a9..120c4fa7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1223,7 +1223,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-live"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1232,7 +1232,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1240,7 +1240,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "0.6.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -1264,17 +1264,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "0.7.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "makepad-html"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1282,7 +1282,7 @@ dependencies = [
 [[package]]
 name = "makepad-http"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "makepad-jni-sys"
@@ -1293,7 +1293,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-live-compiler"
 version = "0.5.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-derive-live",
  "makepad-live-tokenizer",
@@ -1303,7 +1303,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -1311,7 +1311,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1319,7 +1319,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-tokenizer"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-id",
  "makepad-math",
@@ -1329,7 +1329,7 @@ dependencies = [
 [[package]]
 name = "makepad-markdown"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1337,17 +1337,17 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-micro-serde-derive",
 ]
@@ -1355,7 +1355,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1363,12 +1363,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "makepad-platform"
 version = "0.6.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-android-state",
  "makepad-futures",
@@ -1386,7 +1386,7 @@ dependencies = [
 [[package]]
 name = "makepad-rustybuzz"
 version = "0.8.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -1401,7 +1401,7 @@ dependencies = [
 [[package]]
 name = "makepad-shader-compiler"
 version = "0.5.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-live-compiler",
 ]
@@ -1409,7 +1409,7 @@ dependencies = [
 [[package]]
 name = "makepad-vector"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "ttf-parser",
 ]
@@ -1417,7 +1417,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -1426,7 +1426,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "0.6.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -1439,7 +1439,7 @@ dependencies = [
 [[package]]
 name = "makepad-windows"
 version = "0.51.1"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "windows-core 0.51.1",
  "windows-targets 0.48.5",
@@ -1448,7 +1448,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.2.14"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "bitflags 2.5.0",
 ]
@@ -1456,7 +1456,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "simd-adler32",
 ]
@@ -1464,7 +1464,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.3.17"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -1472,7 +1472,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.2.1"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -2733,7 +2733,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "ttf-parser"
 version = "0.19.0"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 
 [[package]]
 name = "typenum"
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.51.1"
-source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#6eba48bdc6829258cf92182fc91e20dfe94fa0c7"
+source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
 dependencies = [
  "windows-targets 0.48.5",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 87f46c7d..09c292fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,9 +7,7 @@ members = [
     "moxin-backend",
     "moxin-fake-backend",
 ]
-exclude = [
-    "packaging/before-packaging-command"
-]
+exclude = ["packaging/before-packaging-command"]
 
 [package]
 name = "moxin"
@@ -29,7 +27,7 @@ moxin-protocol = { path = "moxin-protocol" }
 moxin-backend = { path = "moxin-backend" }
 moxin-fake-backend = { path = "moxin-fake-backend" }
 
-makepad-widgets = { git = "https://github.com/jmbejar/makepad", branch = "moxin-release-v1" }
+makepad-widgets = { git = "https://github.com/noxware/makepad", rev = "7ebad2443" }
 
 robius-open = "0.1.0"
 robius-url-handler = { git = "https://github.com/project-robius/robius-url-handler" }
@@ -130,7 +128,7 @@ section = "utils"
 
 [package.metadata.packager.appimage]
 ## `curl` is needed for `moxin-runner` to auto-install wasmedge.
-bins = [ "/usr/bin/curl" ]
+bins = ["/usr/bin/curl"]
 
 [package.metadata.packager.macos]
 minimum_system_version = "11.0"
diff --git a/src/chat/chat_history.rs b/src/chat/chat_history.rs
index 011cf139..4b65c2c1 100644
--- a/src/chat/chat_history.rs
+++ b/src/chat/chat_history.rs
@@ -1,5 +1,5 @@
 use super::chat_history_card::ChatHistoryCardWidgetRefExt;
-use crate::{data::store::Store, shared::toggle_panel::TogglePanel};
+use crate::data::store::Store;
 use makepad_widgets::*;
 
 live_design! {
@@ -7,7 +7,7 @@ live_design! {
     import makepad_widgets::theme_desktop_dark::*;
 
     import crate::shared::styles::*;
-    import crate::shared::widgets::MoxinButton;
+    import crate::shared::widgets::*;
     import makepad_draw::shader::std::*;
 
     import crate::chat::shared::ChatAgentAvatar;
@@ -15,7 +15,7 @@ live_design! {
 
     ICON_NEW_CHAT = dep("crate://self/resources/icons/new_chat.svg")
 
-    ChatHistory = {{ChatHistory}} {
+    ChatHistory = {{ChatHistory}} <MoxinTogglePanel> {
         open_content = {
             <View> {
                 width: Fill,
diff --git a/src/chat/chat_params.rs b/src/chat/chat_params.rs
index e99d3888..560be57f 100644
--- a/src/chat/chat_params.rs
+++ b/src/chat/chat_params.rs
@@ -2,7 +2,7 @@ use makepad_widgets::*;
 
 use crate::{
     data::{chats::chat::ChatID, store::Store},
-    shared::{actions::TooltipAction, toggle_panel::TogglePanel},
+    shared::actions::TooltipAction,
 };
 
 live_design! {
@@ -10,11 +10,7 @@ live_design! {
     import makepad_widgets::theme_desktop_dark::*;
 
     import crate::shared::styles::*;
-    import crate::shared::widgets::FadeView;
-    import crate::shared::widgets::MoxinButton;
-    import crate::shared::widgets::MoxinSlider;
-    import crate::shared::widgets::MoxinSwitch;
-    import crate::shared::widgets::MoxinTextInput;
+    import crate::shared::widgets::*;
     import makepad_draw::shader::std::*;
 
     ICON_CLOSE_PANEL = dep("crate://self/resources/icons/close_right_panel.svg")
@@ -36,7 +32,7 @@ live_design! {
         }
     }
 
-    ChatParams = {{ChatParams}} {
+    ChatParams = {{ChatParams}} <MoxinTogglePanel> {
         open_content = {
             <View> {
                 width: Fill
diff --git a/src/shared/mod.rs b/src/shared/mod.rs
index 117884fe..0bc4f617 100644
--- a/src/shared/mod.rs
+++ b/src/shared/mod.rs
@@ -8,7 +8,6 @@ pub mod modal;
 pub mod portal;
 pub mod resource_imports;
 pub mod styles;
-pub mod toggle_panel;
 pub mod tooltip;
 pub mod utils;
 pub mod widgets;
@@ -23,5 +22,4 @@ pub fn live_design(cx: &mut Cx) {
     download_notification_popup::live_design(cx);
     tooltip::live_design(cx);
     desktop_buttons::live_design(cx);
-    toggle_panel::live_design(cx);
 }
diff --git a/src/shared/toggle_panel.rs b/src/shared/toggle_panel.rs
deleted file mode 100644
index 571efc6e..00000000
--- a/src/shared/toggle_panel.rs
+++ /dev/null
@@ -1,286 +0,0 @@
-use makepad_widgets::*;
-
-live_design! {
-    import makepad_widgets::base::*;
-    import makepad_widgets::theme_desktop_dark::*;
-    import makepad_draw::shader::std::*;
-
-    ICON_CLOSE_PANEL = dep("crate://self/resources/icons/close_left_panel.svg")
-    ICON_OPEN_PANEL = dep("crate://self/resources/icons/open_left_panel.svg")
-
-    FadeView = <CachedView> {
-        draw_bg: {
-            instance opacity: 1.0
-
-            fn pixel(self) -> vec4 {
-                let color = sample2d_rt(self.image, self.pos * self.scale + self.shift) + vec4(self.marked, 0.0, 0.0, 0.0);
-                return Pal::premul(vec4(color.xyz, color.w * self.opacity))
-            }
-        }
-    }
-
-    CustomButton = <Button> {
-        draw_bg: {
-            instance color: #0000
-            instance color_hover: #fff
-            instance border_width: 1.0
-            instance border_color: #0000
-            instance border_color_hover: #fff
-            instance radius: 2.5
-
-            fn get_color(self) -> vec4 {
-                return mix(self.color, mix(self.color, self.color_hover, 0.2), self.hover)
-            }
-
-            fn get_border_color(self) -> vec4 {
-                return mix(self.border_color, mix(self.border_color, self.border_color_hover, 0.2), self.hover)
-            }
-
-            fn pixel(self) -> vec4 {
-                let sdf = Sdf2d::viewport(self.pos * self.rect_size)
-                sdf.box(
-                    self.border_width,
-                    self.border_width,
-                    self.rect_size.x - (self.border_width * 2.0),
-                    self.rect_size.y - (self.border_width * 2.0),
-                    max(1.0, self.radius)
-                )
-                sdf.fill_keep(self.get_color())
-                if self.border_width > 0.0 {
-                    sdf.stroke(self.get_border_color(), self.border_width)
-                }
-                return sdf.result;
-            }
-        }
-
-        draw_icon: {
-            instance color: #fff
-            instance color_hover: #000
-            uniform rotation_angle: 0.0,
-
-            fn get_color(self) -> vec4 {
-                return mix(self.color, mix(self.color, self.color_hover, 0.2), self.hover)
-            }
-
-            // Support rotation of the icon
-            fn clip_and_transform_vertex(self, rect_pos: vec2, rect_size: vec2) -> vec4 {
-                let clipped: vec2 = clamp(
-                    self.geom_pos * rect_size + rect_pos,
-                    self.draw_clip.xy,
-                    self.draw_clip.zw
-                )
-                self.pos = (clipped - rect_pos) / rect_size
-
-                // Calculate the texture coordinates based on the rotation angle
-                let angle_rad = self.rotation_angle * 3.14159265359 / 180.0;
-                let cos_angle = cos(angle_rad);
-                let sin_angle = sin(angle_rad);
-                let rot_matrix = mat2(
-                    cos_angle, -sin_angle,
-                    sin_angle, cos_angle
-                );
-                self.tex_coord1 = mix(
-                    self.icon_t1.xy,
-                    self.icon_t2.xy,
-                    (rot_matrix * (self.pos.xy - vec2(0.5))) + vec2(0.5)
-                );
-
-                return self.camera_projection * (self.camera_view * (self.view_transform * vec4(
-                    clipped.x,
-                    clipped.y,
-                    self.draw_depth + self.draw_zbias,
-                    1.
-                )))
-            }
-        }
-        icon_walk: {width: 14, height: 14}
-
-        draw_text: {
-            text_style: <REGULAR_FONT>{font_size: 9},
-            fn get_color(self) -> vec4 {
-                return self.color;
-            }
-        }
-    }
-
-    ToggleButton = <CustomButton> {
-        width: Fit,
-        height: Fit,
-        icon_walk: {width: 20, height: 20},
-        draw_icon: {
-            fn get_color(self) -> vec4 {
-                return #475467;
-            }
-        }
-    }
-
-    TogglePanel = {{TogglePanel}} {
-        flow: Overlay,
-        width: 300,
-        height: Fill,
-
-        open_content = <FadeView> {
-            width: Fill
-            height: Fill
-        }
-
-        persistent_content = <View> {
-            height: Fit
-            width: Fill
-            default = <View> {
-                height: Fit,
-                width: Fill,
-                padding: {top: 58, left: 15, right: 15}
-                spacing: 10,
-
-                before = <View> {
-                    height: Fit,
-                    width: Fit,
-                    spacing: 10,
-                }
-
-                close = <ToggleButton> {
-                    draw_icon: {
-                        svg_file: (ICON_CLOSE_PANEL),
-                    }
-                }
-
-                open = <ToggleButton> {
-                    visible: false,
-                    draw_icon: {
-                        svg_file: (ICON_OPEN_PANEL),
-                    }
-                }
-
-                after = <View> {
-                    height: Fit,
-                    width: Fit,
-                    spacing: 10,
-                }
-            }
-        }
-
-        animator: {
-            panel = {
-                default: open,
-                open = {
-                    redraw: true,
-                    from: {all: Forward {duration: 0.3}}
-                    ease: ExpDecay {d1: 0.80, d2: 0.97}
-                    apply: {animator_panel_progress: 1.0, open_content = { draw_bg: {opacity: 1.0} }}
-                }
-                close = {
-                    redraw: true,
-                    from: {all: Forward {duration: 0.3}}
-                    ease: ExpDecay {d1: 0.80, d2: 0.97}
-                    apply: {animator_panel_progress: 0.0, open_content = { draw_bg: {opacity: 0.0} }}
-                }
-            }
-        }
-    }
-}
-
-/// A toggable side panel that can be expanded and collapsed to a maximum and minimum size.
-#[derive(Live, Widget)]
-pub struct TogglePanel {
-    #[deref]
-    view: View,
-
-    /// Internal use only. Used by the animator to track the progress of the panel
-    /// animation to overcome some limitations (for ex: `apply_over` doesn't work well
-    /// over the animator).
-    #[live]
-    animator_panel_progress: f32,
-
-    /// The size of the panel when it is fully open.
-    #[live(300.0)]
-    open_size: f32,
-
-    /// The size of the panel when it is fully closed.
-    #[live(110.0)]
-    close_size: f32,
-
-    #[animator]
-    animator: Animator,
-}
-
-impl LiveHook for TogglePanel {
-    fn after_new_from_doc(&mut self, cx: &mut Cx) {
-        if self.is_open(cx) {
-            self.animator_panel_progress = 1.0;
-        } else {
-            self.animator_panel_progress = 0.0;
-        };
-    }
-}
-
-impl Widget for TogglePanel {
-    fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
-        if self.animator_handle_event(cx, event).must_redraw() {
-            self.redraw(cx)
-        };
-
-        if let Event::Actions(actions) = event {
-            let open = self.button(id!(open));
-            let close = self.button(id!(close));
-
-            if open.clicked(actions) {
-                open.set_visible(false);
-                close.set_visible(true);
-                self.set_open(cx, true);
-            }
-
-            if close.clicked(actions) {
-                close.set_visible(false);
-                open.set_visible(true);
-                self.set_open(cx, false);
-            }
-        }
-
-        self.view.handle_event(cx, event, scope);
-    }
-
-    fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
-        let mut walk = walk;
-
-        let size_range = self.open_size - self.close_size;
-        let size = self.close_size + size_range * self.animator_panel_progress;
-        walk.width = Size::Fixed(size.into());
-
-        self.view.draw_walk(cx, scope, walk)
-    }
-}
-
-impl TogglePanel {
-    /// Returns whether the panel is currently open.
-    pub fn is_open(&self, cx: &Cx) -> bool {
-        self.animator_in_state(cx, id!(panel.open))
-    }
-
-    /// Sets whether the panel is open. Causes the panel to animate to the new state.
-    pub fn set_open(&mut self, cx: &mut Cx, open: bool) {
-        if open {
-            self.animator_play(cx, id!(panel.open));
-        } else {
-            self.animator_play(cx, id!(panel.close));
-        }
-    }
-}
-
-impl TogglePanelRef {
-    /// Calls `is_open` on it's inner.
-    pub fn is_open(&self, cx: &Cx) -> bool {
-        if let Some(inner) = self.borrow() {
-            inner.is_open(cx)
-        } else {
-            false
-        }
-    }
-
-    /// Calls `set_open` on it's inner.
-    pub fn set_open(&self, cx: &mut Cx, open: bool) {
-        if let Some(mut inner) = self.borrow_mut() {
-            inner.set_open(cx, open);
-        }
-    }
-}
diff --git a/src/shared/widgets.rs b/src/shared/widgets.rs
index 0ebe2292..2797d49a 100644
--- a/src/shared/widgets.rs
+++ b/src/shared/widgets.rs
@@ -466,4 +466,33 @@ live_design! {
             }
         }
     }
+
+    TogglePanelButton = <MoxinButton> {
+        width: Fit,
+        height: Fit,
+        icon_walk: {width: 20, height: 20},
+        draw_icon: {
+            fn get_color(self) -> vec4 {
+                return #475467;
+            }
+        }
+    }
+
+    MoxinTogglePanel = <TogglePanel> {
+        persistent_content = {
+            default = {
+                open = <TogglePanelButton> {
+                    visible: false,
+                    draw_icon: {
+                        svg_file: (TOGGLE_PANEL_OPEN_ICON)
+                    }
+                }
+                close = <TogglePanelButton> {
+                    draw_icon: {
+                        svg_file: (TOGGLE_PANEL_CLOSE_ICON)
+                    }
+                }
+            }
+        }
+    }
 }

From 6c1da6a02127111751c9318a88ba063655d3ec64 Mon Sep 17 00:00:00 2001
From: noxware <7684329+noxware@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:57:27 -0300
Subject: [PATCH 2/3] remove unused left panel icons

---
 resources/icons/close_left_panel.svg | 1 -
 resources/icons/open_left_panel.svg  | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 resources/icons/close_left_panel.svg
 delete mode 100644 resources/icons/open_left_panel.svg

diff --git a/resources/icons/close_left_panel.svg b/resources/icons/close_left_panel.svg
deleted file mode 100644
index 6e9724d3..00000000
--- a/resources/icons/close_left_panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M3.654 1.059 C 3.292 1.125,3.120 1.181,2.820 1.331 C 2.137 1.672,1.637 2.181,1.304 2.878 C 0.998 3.516,1.020 2.804,1.020 12.000 C 1.020 19.750,1.024 20.237,1.091 20.524 C 1.361 21.672,2.328 22.639,3.476 22.909 C 3.763 22.976,4.250 22.980,12.000 22.980 C 19.750 22.980,20.237 22.976,20.524 22.909 C 21.672 22.639,22.639 21.672,22.909 20.524 C 22.976 20.237,22.980 19.750,22.980 12.000 C 22.980 4.250,22.976 3.763,22.909 3.476 C 22.646 2.357,21.747 1.433,20.606 1.107 L 20.300 1.020 12.120 1.013 C 5.545 1.008,3.884 1.017,3.654 1.059 M7.680 12.000 L 7.680 21.000 5.842 21.000 C 4.083 21.000,3.993 20.996,3.783 20.918 C 3.528 20.822,3.251 20.572,3.113 20.315 L 3.020 20.140 3.010 12.086 C 3.003 6.680,3.013 3.981,3.040 3.879 C 3.131 3.543,3.524 3.139,3.854 3.044 C 3.923 3.024,4.813 3.006,5.830 3.004 L 7.680 3.000 7.680 12.000 M20.220 3.083 C 20.518 3.195,20.805 3.482,20.917 3.780 L 21.000 4.003 21.000 12.000 L 21.000 19.997 20.917 20.220 C 20.805 20.518,20.518 20.805,20.220 20.917 C 19.998 21.000,19.970 21.000,14.838 21.000 L 9.680 21.000 9.680 12.000 L 9.680 3.000 14.838 3.000 C 19.970 3.000,19.998 3.000,20.220 3.083 M16.115 7.735 C 16.036 7.764,15.919 7.825,15.855 7.871 C 15.631 8.034,12.287 11.422,12.215 11.560 C 12.163 11.659,12.141 11.788,12.141 12.000 C 12.140 12.255,12.156 12.327,12.247 12.480 C 12.383 12.707,15.812 16.127,15.998 16.221 C 16.074 16.259,16.249 16.300,16.387 16.311 C 16.602 16.328,16.668 16.316,16.858 16.223 C 17.358 15.978,17.575 15.387,17.338 14.912 C 17.302 14.839,16.649 14.155,15.886 13.390 L 14.500 12.000 15.886 10.610 C 16.649 9.845,17.302 9.161,17.338 9.088 C 17.573 8.619,17.349 8.002,16.863 7.775 C 16.634 7.669,16.345 7.653,16.115 7.735 " stroke="none" fill-rule="evenodd" fill="black"></path></svg>
\ No newline at end of file
diff --git a/resources/icons/open_left_panel.svg b/resources/icons/open_left_panel.svg
deleted file mode 100644
index 4bd318ab..00000000
--- a/resources/icons/open_left_panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.654 1.059 C 4.292 1.125,4.120 1.181,3.820 1.331 C 3.137 1.672,2.637 2.181,2.304 2.878 C 1.998 3.516,2.020 2.804,2.020 12.000 C 2.020 19.750,2.024 20.237,2.091 20.524 C 2.361 21.672,3.328 22.639,4.476 22.909 C 4.763 22.976,5.250 22.980,13.000 22.980 C 20.750 22.980,21.237 22.976,21.524 22.909 C 22.672 22.639,23.639 21.672,23.909 20.524 C 23.976 20.237,23.980 19.750,23.980 12.000 C 23.980 4.250,23.976 3.763,23.909 3.476 C 23.646 2.357,22.747 1.433,21.606 1.107 L 21.300 1.020 13.120 1.013 C 6.545 1.008,4.884 1.017,4.654 1.059 M7.560 12.000 L 7.560 21.000 6.282 21.000 C 5.088 21.000,4.988 20.994,4.783 20.918 C 4.528 20.822,4.251 20.572,4.113 20.315 L 4.020 20.140 4.010 12.086 C 4.003 6.680,4.013 3.981,4.040 3.879 C 4.131 3.543,4.524 3.139,4.854 3.044 C 4.923 3.024,5.560 3.006,6.270 3.004 L 7.560 3.000 7.560 12.000 M21.220 3.083 C 21.518 3.195,21.805 3.482,21.917 3.780 L 22.000 4.003 22.000 12.000 L 22.000 19.997 21.917 20.220 C 21.805 20.518,21.518 20.805,21.220 20.917 C 20.998 21.000,20.978 21.000,15.278 21.000 L 9.560 21.000 9.560 12.000 L 9.560 3.000 15.278 3.000 C 20.978 3.000,20.998 3.000,21.220 3.083 M12.670 7.735 C 12.325 7.863,12.109 8.120,12.031 8.495 C 11.991 8.684,11.995 8.750,12.056 8.948 C 12.125 9.171,12.179 9.232,13.533 10.590 L 14.938 12.000 13.533 13.410 C 12.179 14.768,12.125 14.829,12.056 15.052 C 11.994 15.252,11.991 15.315,12.032 15.512 C 12.092 15.801,12.249 16.025,12.498 16.179 C 12.671 16.286,12.729 16.300,12.997 16.299 C 13.212 16.299,13.341 16.277,13.440 16.225 C 13.632 16.124,17.059 12.704,17.193 12.480 C 17.284 12.327,17.300 12.255,17.299 12.000 C 17.299 11.788,17.277 11.659,17.225 11.560 C 17.127 11.372,13.706 7.942,13.488 7.813 C 13.277 7.687,12.895 7.651,12.670 7.735 " stroke="none" fill-rule="evenodd" fill="black"></path></svg>
\ No newline at end of file

From 8de7ad0abd58a72f282f43375dba48b76e4ea370 Mon Sep 17 00:00:00 2001
From: Jorge Bejar <jorge@wyeworks.com>
Date: Fri, 2 Aug 2024 10:55:30 -0300
Subject: [PATCH 3/3] Point back to temporal Makepad branch

---
 Cargo.lock | 62 +++++++++++++++++++++++++++---------------------------
 Cargo.toml |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 120c4fa7..5a716237 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1223,7 +1223,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-live"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1232,7 +1232,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1240,7 +1240,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "0.6.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -1264,17 +1264,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "0.7.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "makepad-html"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1282,7 +1282,7 @@ dependencies = [
 [[package]]
 name = "makepad-http"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "makepad-jni-sys"
@@ -1293,7 +1293,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-live-compiler"
 version = "0.5.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-derive-live",
  "makepad-live-tokenizer",
@@ -1303,7 +1303,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -1311,7 +1311,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1319,7 +1319,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-tokenizer"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-id",
  "makepad-math",
@@ -1329,7 +1329,7 @@ dependencies = [
 [[package]]
 name = "makepad-markdown"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1337,17 +1337,17 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-micro-serde-derive",
 ]
@@ -1355,7 +1355,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1363,12 +1363,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "makepad-platform"
 version = "0.6.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-android-state",
  "makepad-futures",
@@ -1386,7 +1386,7 @@ dependencies = [
 [[package]]
 name = "makepad-rustybuzz"
 version = "0.8.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -1401,7 +1401,7 @@ dependencies = [
 [[package]]
 name = "makepad-shader-compiler"
 version = "0.5.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-live-compiler",
 ]
@@ -1409,7 +1409,7 @@ dependencies = [
 [[package]]
 name = "makepad-vector"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "ttf-parser",
 ]
@@ -1417,7 +1417,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "0.4.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -1426,7 +1426,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "0.6.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -1439,7 +1439,7 @@ dependencies = [
 [[package]]
 name = "makepad-windows"
 version = "0.51.1"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "windows-core 0.51.1",
  "windows-targets 0.48.5",
@@ -1448,7 +1448,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.2.14"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "bitflags 2.5.0",
 ]
@@ -1456,7 +1456,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "simd-adler32",
 ]
@@ -1464,7 +1464,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.3.17"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -1472,7 +1472,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.2.1"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -2733,7 +2733,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "ttf-parser"
 version = "0.19.0"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 
 [[package]]
 name = "typenum"
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.51.1"
-source = "git+https://github.com/noxware/makepad?rev=7ebad2443#7ebad244342af37aa6e61e0982e247cd8036771f"
+source = "git+https://github.com/jmbejar/makepad?branch=moxin-release-v1#feaf1cdcc49e44cae9d3d3e202a20e44fca5e53d"
 dependencies = [
  "windows-targets 0.48.5",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 09c292fa..f40d45a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ moxin-protocol = { path = "moxin-protocol" }
 moxin-backend = { path = "moxin-backend" }
 moxin-fake-backend = { path = "moxin-fake-backend" }
 
-makepad-widgets = { git = "https://github.com/noxware/makepad", rev = "7ebad2443" }
+makepad-widgets = { git = "https://github.com/jmbejar/makepad", branch = "moxin-release-v1" }
 
 robius-open = "0.1.0"
 robius-url-handler = { git = "https://github.com/project-robius/robius-url-handler" }