From be3261419b66a49359577d3173abb2c7ee6a7768 Mon Sep 17 00:00:00 2001
From: Kristian Myram <kristian.myram@gmail.com>
Date: Wed, 14 Oct 2026 00:46:05 +0200
Subject: [PATCH] =?UTF-8?q?Viewer:=20Composition=20Settings=E2=80=A6=20in?=
 =?UTF-8?q?=20the=20composition's=20right-click=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 crates/ui-egui/src/panels/viewer.rs            |  7 +++++++
 crates/ui-egui/tests/ui_blank_context_menus.rs | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/crates/ui-egui/src/panels/viewer.rs b/crates/ui-egui/src/panels/viewer.rs
index f4bb5a88..c5251a27 100644
--- a/crates/ui-egui/src/panels/viewer.rs
+++ b/crates/ui-egui/src/panels/viewer.rs
@@ -1281,6 +1281,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             context_actions.push(("comp.copyFrame".to_owned(), serde_json::json!({"comp": cid.0})));
             ui.close();
         }
+        // The comp this viewer shows, which is not always the active one.
+        let settings = ui.button(crate::i18n::tr("Composition Settings…"));
+        app.auto.add("viewer.context.settings", settings.rect, "Composition Settings…");
+        if settings.clicked() {
+            context_actions.push(("comp.settings".to_owned(), serde_json::json!({"comp": cid.0})));
+            ui.close();
+        }
     });
     for (id, params) in context_actions {
         if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
diff --git a/crates/ui-egui/tests/ui_blank_context_menus.rs b/crates/ui-egui/tests/ui_blank_context_menus.rs
index 96789fe7..3c03149a 100644
--- a/crates/ui-egui/tests/ui_blank_context_menus.rs
+++ b/crates/ui-egui/tests/ui_blank_context_menus.rs
@@ -87,6 +87,20 @@ fn timeline_blank_menu_opens_solid_settings() {
     assert_eq!(h.state().dialog, Some(Dialog::SolidSettings));
 }
 
+/// Right-clicking the composition in the viewer offers Composition Settings…, which opens on the
+/// comp the viewer shows.
+#[test]
+fn viewer_menu_opens_composition_settings() {
+    let mut h = harness();
+    let comp = h.state().session.active_comp_id().unwrap();
+    let p = rect(&h, "viewer.comp").center();
+    right_click(&mut h, p);
+    h.get_by_label("Composition Settings…").click();
+    h.run_steps(3);
+    assert_eq!(h.state().dialog, Some(Dialog::CompSettings));
+    assert_eq!(h.state().session.active_comp_id(), Some(comp));
+}
+
 #[test]
 fn project_item_and_timeline_layer_keep_their_own_context_menus() {
     let mut h = harness();