From a1c59717021141bed834f8f9eab785bddf0ff3bb Mon Sep 17 00:00:00 2001 From: 28allday Date: Wed, 29 Jul 2026 17:02:33 +0100 Subject: [PATCH] Mark upstream fixes 001/002 as raised, record quattro as the target branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PRs basecamp/omarchy#6429 and #6430. Both target `quattro` — upstream `master` is still Omarchy 3 and has no default/hypr/apps/davinci-resolve.lua at all. Co-Authored-By: Claude Opus 5 (1M context) --- omarchy-upstream-fixes/001-resolve-bar-overlap.md | 3 ++- omarchy-upstream-fixes/002-resolve-dialog-focus-trap.md | 3 ++- omarchy-upstream-fixes/README.md | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/omarchy-upstream-fixes/001-resolve-bar-overlap.md b/omarchy-upstream-fixes/001-resolve-bar-overlap.md index 51d64c3..3bddcc6 100644 --- a/omarchy-upstream-fixes/001-resolve-bar-overlap.md +++ b/omarchy-upstream-fixes/001-resolve-bar-overlap.md @@ -1,6 +1,7 @@ # Fix 001 — DaVinci Resolve's main window is covered by the Omarchy bar -**Status:** ready to raise · **Target project:** [omarchy](https://github.com/basecamp/omarchy) +**Status:** raised — [basecamp/omarchy#6429](https://github.com/basecamp/omarchy/pull/6429) · **Target project:** [omarchy](https://github.com/basecamp/omarchy) +**Target branch:** `quattro` (Omarchy 4 lives there; `master` is still Omarchy 3 and has no Lua config) **Target file:** `default/hypr/apps/davinci-resolve.lua` **Change type:** append one window rule + explanatory comment. No new deps, no other app affected. diff --git a/omarchy-upstream-fixes/002-resolve-dialog-focus-trap.md b/omarchy-upstream-fixes/002-resolve-dialog-focus-trap.md index 9ca1f49..a41cf18 100644 --- a/omarchy-upstream-fixes/002-resolve-dialog-focus-trap.md +++ b/omarchy-upstream-fixes/002-resolve-dialog-focus-trap.md @@ -1,6 +1,7 @@ # Fix 002 — DaVinci Resolve's dialogs trap the pointer until Resolve is killed -**Status:** ready to raise — fully verified (§5) · **Target project:** [omarchy](https://github.com/basecamp/omarchy) +**Status:** raised — [basecamp/omarchy#6430](https://github.com/basecamp/omarchy/pull/6430), fully verified (§5) · **Target project:** [omarchy](https://github.com/basecamp/omarchy) +**Target branch:** `quattro` (Omarchy 4 lives there; `master` is still Omarchy 3 and has no Lua config) **Target file:** `default/hypr/apps/davinci-resolve.lua` **Change type:** append one window rule + comment. Narrows an existing rule; removes nothing. diff --git a/omarchy-upstream-fixes/README.md b/omarchy-upstream-fixes/README.md index c301070..008b2bf 100644 --- a/omarchy-upstream-fixes/README.md +++ b/omarchy-upstream-fixes/README.md @@ -12,8 +12,8 @@ an AI and they can open the PR from it alone. | # | Fix | Target file | Status | | --- | ---------------------------------------------------------------- | ------------------------------------------ | -------------- | -| 001 | [Resolve's main window is covered by the bar](001-resolve-bar-overlap.md) | `default/hypr/apps/davinci-resolve.lua` | ready to raise | -| 002 | [Resolve's dialogs trap the pointer](002-resolve-dialog-focus-trap.md) | `default/hypr/apps/davinci-resolve.lua` | ready to raise | +| 001 | [Resolve's main window is covered by the bar](001-resolve-bar-overlap.md) | `default/hypr/apps/davinci-resolve.lua` | raised ([#6429](https://github.com/basecamp/omarchy/pull/6429)) | +| 002 | [Resolve's dialogs trap the pointer](002-resolve-dialog-focus-trap.md) | `default/hypr/apps/davinci-resolve.lua` | raised ([#6430](https://github.com/basecamp/omarchy/pull/6430)) | ## Raising 001 and 002 — read first