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
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:
201
crates/gpui/examples/anchor.rs
Normal file
201
crates/gpui/examples/anchor.rs
Normal file
@@ -0,0 +1,201 @@
|
||||
#![cfg_attr(target_family = "wasm", no_main)]
|
||||
|
||||
use gpui::{
|
||||
Anchor, AnchoredPositionMode, App, Axis, Bounds, Context, Half as _, InteractiveElement,
|
||||
ParentElement, Pixels, Point, Render, SharedString, Size, Window, WindowBounds, WindowOptions,
|
||||
anchored, deferred, div, point, prelude::*, px, rgb, size,
|
||||
};
|
||||
use gpui_platform::application;
|
||||
|
||||
struct AnchorDemo {
|
||||
hovered_button: Option<usize>,
|
||||
}
|
||||
|
||||
struct ButtonDemo {
|
||||
label: SharedString,
|
||||
corner: Option<Anchor>,
|
||||
}
|
||||
|
||||
fn resolved_position(corner: Anchor, button_size: Size<Pixels>) -> Point<Pixels> {
|
||||
let offset = Point {
|
||||
x: px(0.),
|
||||
y: -button_size.height,
|
||||
};
|
||||
|
||||
offset
|
||||
+ match corner.other_side_along(Axis::Vertical) {
|
||||
Anchor::TopLeft => point(px(0.0), px(0.0)),
|
||||
Anchor::TopCenter => point(button_size.width.half(), px(0.0)),
|
||||
Anchor::TopRight => point(button_size.width, px(0.0)),
|
||||
Anchor::LeftCenter => point(button_size.width, button_size.height.half()),
|
||||
Anchor::RightCenter => point(px(0.), button_size.height.half()),
|
||||
Anchor::BottomLeft => point(px(0.0), button_size.height),
|
||||
Anchor::BottomCenter => point(button_size.width / 2.0, button_size.height),
|
||||
Anchor::BottomRight => point(button_size.width, button_size.height),
|
||||
}
|
||||
}
|
||||
|
||||
impl AnchorDemo {
|
||||
fn buttons() -> Vec<ButtonDemo> {
|
||||
vec![
|
||||
ButtonDemo {
|
||||
label: "TopLeft".into(),
|
||||
corner: Some(Anchor::TopLeft),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "TopCenter".into(),
|
||||
corner: Some(Anchor::TopCenter),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "TopRight".into(),
|
||||
corner: Some(Anchor::TopRight),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "LeftCenter".into(),
|
||||
corner: Some(Anchor::LeftCenter),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "Center".into(),
|
||||
corner: None,
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "RightCenter".into(),
|
||||
corner: Some(Anchor::RightCenter),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "BottomLeft".into(),
|
||||
corner: Some(Anchor::BottomLeft),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "BottomCenter".into(),
|
||||
corner: Some(Anchor::BottomCenter),
|
||||
},
|
||||
ButtonDemo {
|
||||
label: "BottomRight".into(),
|
||||
corner: Some(Anchor::BottomRight),
|
||||
},
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for AnchorDemo {
|
||||
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||||
let buttons = Self::buttons();
|
||||
let button_size = size(px(120.0), px(65.0));
|
||||
|
||||
div()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.size_full()
|
||||
.items_center()
|
||||
.justify_center()
|
||||
.bg(gpui::white())
|
||||
.gap_4()
|
||||
.p_10()
|
||||
.child("Popover with Anchor")
|
||||
.child(
|
||||
div()
|
||||
.size_128()
|
||||
.grid()
|
||||
.grid_cols(3)
|
||||
.gap_6()
|
||||
.relative()
|
||||
.children(buttons.iter().enumerate().map(|(index, button)| {
|
||||
let is_hovered = self.hovered_button == Some(index);
|
||||
let is_hoverable = button.corner.is_some();
|
||||
div()
|
||||
.relative()
|
||||
.child(
|
||||
div()
|
||||
.id(("button", index))
|
||||
.w(button_size.width)
|
||||
.h(button_size.height)
|
||||
.flex()
|
||||
.items_center()
|
||||
.justify_center()
|
||||
.bg(gpui::white())
|
||||
.when(is_hoverable, |this| {
|
||||
this.border_1()
|
||||
.rounded_lg()
|
||||
.border_color(gpui::black())
|
||||
.hover(|style| {
|
||||
style.bg(gpui::black()).text_color(gpui::white())
|
||||
})
|
||||
.on_hover(cx.listener(
|
||||
move |this, hovered, _window, cx| {
|
||||
if *hovered {
|
||||
this.hovered_button = Some(index);
|
||||
} else if this.hovered_button == Some(index) {
|
||||
this.hovered_button = None;
|
||||
}
|
||||
cx.notify();
|
||||
},
|
||||
))
|
||||
.child(button.label.clone())
|
||||
}),
|
||||
)
|
||||
.when_some(self.hovered_button.filter(|_| is_hovered), |this, index| {
|
||||
let button = &buttons[index];
|
||||
let Some(corner) = button.corner else {
|
||||
return this;
|
||||
};
|
||||
|
||||
let position = resolved_position(corner, button_size);
|
||||
this.child(deferred(
|
||||
anchored()
|
||||
.anchor(corner)
|
||||
.position(position)
|
||||
.position_mode(AnchoredPositionMode::Local)
|
||||
.snap_to_window()
|
||||
.child(
|
||||
div()
|
||||
.py_0p5()
|
||||
.px_2()
|
||||
.bg(gpui::black().opacity(0.75))
|
||||
.text_color(rgb(0xffffff))
|
||||
.rounded_sm()
|
||||
.shadow_sm()
|
||||
.min_w(px(100.0))
|
||||
.text_sm()
|
||||
.child(button.label.clone()),
|
||||
),
|
||||
))
|
||||
})
|
||||
})),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn run_example() {
|
||||
application().run(|cx: &mut App| {
|
||||
cx.open_window(
|
||||
WindowOptions {
|
||||
window_bounds: Some(WindowBounds::Windowed(Bounds::centered(
|
||||
None,
|
||||
size(px(750.), px(600.)),
|
||||
cx,
|
||||
))),
|
||||
..Default::default()
|
||||
},
|
||||
|_, cx| {
|
||||
cx.new(|_| AnchorDemo {
|
||||
hovered_button: None,
|
||||
})
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
cx.activate(true);
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
fn main() {
|
||||
run_example();
|
||||
}
|
||||
|
||||
#[cfg(target_family = "wasm")]
|
||||
#[wasm_bindgen::prelude::wasm_bindgen(start)]
|
||||
pub fn start() {
|
||||
gpui_platform::web_init();
|
||||
run_example();
|
||||
}
|
||||
Reference in New Issue
Block a user