fix(ui): right-aligned text no longer draws through the hover action buttons (#1030)

Bump the gpui fork to paint an aligned line into a layer that covers its
glyphs. The layer was sized from the unaligned origin, so the Changes panel's
flush-right directory shared a draw order with the opaque action strip painted
over it, and sprites draw after quads within one order.
This commit is contained in:
l0ng-ai
2026-09-30 10:07:08 +08:00
committed by GitHub
parent b26c26ca66
commit b32cca8266
2 changed files with 31 additions and 25 deletions
Generated
+25 -25
View File
@@ -1623,7 +1623,7 @@ dependencies = [
[[package]]
name = "collections"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"gpui_util",
"indexmap",
@@ -2286,7 +2286,7 @@ dependencies = [
[[package]]
name = "derive_refineable"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"proc-macro2",
"quote",
@@ -3783,7 +3783,7 @@ dependencies = [
[[package]]
name = "gpui"
version = "0.2.2"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"accesskit",
"anyhow",
@@ -3974,7 +3974,7 @@ dependencies = [
[[package]]
name = "gpui_linux"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"accesskit",
"accesskit_unix",
@@ -4025,7 +4025,7 @@ dependencies = [
[[package]]
name = "gpui_macos"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"accesskit",
"accesskit_macos",
@@ -4072,7 +4072,7 @@ dependencies = [
[[package]]
name = "gpui_macros"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -4083,7 +4083,7 @@ dependencies = [
[[package]]
name = "gpui_platform"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"console_error_panic_hook",
"gpui",
@@ -4096,7 +4096,7 @@ dependencies = [
[[package]]
name = "gpui_shared_string"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"schemars",
"serde",
@@ -4106,7 +4106,7 @@ dependencies = [
[[package]]
name = "gpui_util"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"log",
@@ -4115,7 +4115,7 @@ dependencies = [
[[package]]
name = "gpui_web"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"console_error_panic_hook",
@@ -4139,7 +4139,7 @@ dependencies = [
[[package]]
name = "gpui_wgpu"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"bytemuck",
@@ -4168,7 +4168,7 @@ dependencies = [
[[package]]
name = "gpui_windows"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"accesskit",
"accesskit_windows",
@@ -4537,7 +4537,7 @@ dependencies = [
[[package]]
name = "http_client"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"async-compression",
@@ -4562,7 +4562,7 @@ dependencies = [
[[package]]
name = "http_client_tls"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"rustls",
"rustls-platform-verifier 0.5.3",
@@ -6054,7 +6054,7 @@ checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c"
[[package]]
name = "media"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"bindgen",
@@ -7585,7 +7585,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]]
name = "perf"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"collections",
"serde",
@@ -8690,7 +8690,7 @@ dependencies = [
[[package]]
name = "refineable"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"derive_refineable",
]
@@ -8770,7 +8770,7 @@ dependencies = [
[[package]]
name = "reqwest_client"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"bytes",
@@ -9356,7 +9356,7 @@ dependencies = [
[[package]]
name = "scheduler"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"async-task",
"backtrace",
@@ -10298,7 +10298,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "sum_tree"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"heapless 0.9.3",
"log",
@@ -11939,7 +11939,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "util"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"async-fs",
@@ -11978,7 +11978,7 @@ dependencies = [
[[package]]
name = "util_macros"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"perf",
"quote",
@@ -13958,7 +13958,7 @@ dependencies = [
[[package]]
name = "zlog"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"anyhow",
"chrono",
@@ -14003,7 +14003,7 @@ dependencies = [
[[package]]
name = "ztracing"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
dependencies = [
"tracing",
"tracing-subscriber",
@@ -14014,7 +14014,7 @@ dependencies = [
[[package]]
name = "ztracing_macro"
version = "0.1.0"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#5c390b9359e39f645ed6819e0be4bf3157e8ab3f"
source = "git+https://github.com/l0ng-ai/zed?branch=tty7#3d46ee70fb1c574d30671d55006c6de359c8bf28"
[[package]]
name = "zune-core"
+6
View File
@@ -436,6 +436,12 @@ codegen-units = 1
# Without them NSMenuItem got the literal string "enter" and took its first
# character, so a `secondary-enter` item (ToggleFullscreen) read as ⌘E.
#
# 7. A right- or center-aligned line paints into a layer that covers where its
# glyphs land. The layer was sized from the unaligned origin, so an opaque
# quad painted over the glyphs later got no higher draw order than them, and
# the text showed through — the Changes panel's flush-right directory drew
# through the hover action buttons.
#
# Patching by source rather than editing the `gpui`/`gpui_platform` pins above is
# deliberate: `gpui-component` declares its own `gpui` from the upstream URL, and
# a plain pin swap would put two incompatible copies of gpui in the tree. `[patch]`