logiguard fork: GPUI xdg-activation keyboard-focus serial fix
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled

Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree
with a 3-file patch applied (no upstream history).

Patch (crates/gpui_linux/src/linux/wayland/):
  - serial.rs: add SerialKind::KeyboardEnter
  - client.rs: store wl_keyboard.enter serial; add latest_serial_of()
  - window.rs: activate() uses keyboard-enter serial (Mutter focus gate)

Mutter honors window activation only when the token carries the keyboard-
focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial.
See docs/tray-window-focus-wayland.md in logiguard.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mohamad Khani
2026-07-14 02:22:17 +03:30
commit b72a46db68
3984 changed files with 1583326 additions and 0 deletions

View File

@@ -0,0 +1,110 @@
use gpui::{App, Context, Entity, IntoElement, ParentElement, Render, Subscription, div};
use project::image_store::{ImageFormat, ImageMetadata};
use settings::Settings;
use ui::prelude::*;
use util::size::format_file_size;
use workspace::{HideStatusItem, ItemHandle, StatusItemView, Workspace};
use crate::{ImageFileSizeUnit, ImageView, ImageViewerSettings};
pub struct ImageInfo {
metadata: Option<ImageMetadata>,
_observe_active_image: Option<Subscription>,
observe_image_item: Option<Subscription>,
}
impl ImageInfo {
pub fn new(_workspace: &Workspace) -> Self {
Self {
metadata: None,
_observe_active_image: None,
observe_image_item: None,
}
}
fn update_metadata(&mut self, image_view: &Entity<ImageView>, cx: &mut Context<Self>) {
let image_item = image_view.read(cx).image_item.clone();
let current_metadata = image_item.read(cx).image_metadata;
if current_metadata.is_some() {
self.metadata = current_metadata;
cx.notify();
} else {
self.observe_image_item = Some(cx.observe(&image_item, |this, item, cx| {
this.metadata = item.read(cx).image_metadata;
cx.notify();
}));
}
}
}
fn format_image_size(size: u64, image_unit_type: ImageFileSizeUnit) -> String {
let use_decimal = matches!(image_unit_type, ImageFileSizeUnit::Decimal);
format_file_size(size, use_decimal)
}
impl Render for ImageInfo {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let settings = ImageViewerSettings::get_global(cx);
let Some(metadata) = self.metadata.as_ref() else {
return div().hidden();
};
let mut components = Vec::new();
components.push(format!("{}x{}", metadata.width, metadata.height));
components.push(format_image_size(metadata.file_size, settings.unit));
if let Some(colors) = metadata.colors {
components.push(format!(
"{} channels, {} bits per pixel",
colors.channels,
colors.bits_per_pixel()
));
}
components.push(
match metadata.format {
ImageFormat::Png => "PNG",
ImageFormat::Jpeg => "JPEG",
ImageFormat::Gif => "GIF",
ImageFormat::WebP => "WebP",
ImageFormat::Tiff => "TIFF",
ImageFormat::Bmp => "BMP",
ImageFormat::Ico => "ICO",
ImageFormat::Avif => "Avif",
_ => "Unknown",
}
.to_string(),
);
div().child(Label::new(components.join("")).size(LabelSize::Small))
}
}
impl StatusItemView for ImageInfo {
fn set_active_pane_item(
&mut self,
active_pane_item: Option<&dyn ItemHandle>,
_window: &mut Window,
cx: &mut Context<Self>,
) {
self._observe_active_image = None;
self.observe_image_item = None;
if let Some(image_view) = active_pane_item.and_then(|item| item.act_as::<ImageView>(cx)) {
self.update_metadata(&image_view, cx);
self._observe_active_image = Some(cx.observe(&image_view, |this, view, cx| {
this.update_metadata(&view, cx);
}));
} else {
self.metadata = None;
}
cx.notify();
}
fn hide_setting(&self, _: &App) -> Option<HideStatusItem> {
// The image info is only visible when an image viewer item is active.
None
}
}