Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ updates:
directory: /
schedule:
interval: weekly
groups:
# Both crates come from one zed commit and only build together.
gpui:
patterns:
- gpui
- gpui_platform
- package-ecosystem: github-actions
directory: /
schedule:
Expand Down
85 changes: 26 additions & 59 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/integration_smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ for _ in range(30):
time.sleep(0.1)
else:
raise SystemExit(last)" > "$SMOKE_DIR/browser-probe.json"
assert_json '.succeeded == true and (.stdout.content | contains("# agent-workspace-linux"))' "$SMOKE_DIR/browser-probe.json"
assert_json '.succeeded == true and (.stdout.content | contains("agent-workspace-linux"))' "$SMOKE_DIR/browser-probe.json"
run_awl workspace launch --id "$BROWSER_ID" --name browser-local-dev --wait-window --screenshot-window --window-timeout-ms 15000 -- "$BROWSER_BIN" "--user-data-dir=$SMOKE_DIR/browser-profile" --no-first-run --no-default-browser-check --new-window "$BROWSER_README_URL" > "$SMOKE_DIR/browser-launch.json"
assert_json '.ok == true and (.screenshot.bytes > 0) and ((.windows | length) > 0) and .apps[0].running == true' "$SMOKE_DIR/browser-launch.json"
BROWSER_APP_ID="$(jq -r '.apps[0].id' "$SMOKE_DIR/browser-launch.json")"
Expand Down
6 changes: 3 additions & 3 deletions src/viewer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use gpui::{
Bounds, ClickEvent, Context, CursorStyle, DevicePixels, Div, DivFrameState, Element, ElementId,
FocusHandle, GlobalElementId, Hitbox, InspectorElementId, InteractiveElement, IntoElement,
KeyDownEvent, LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ObjectFit,
ParentElement, Pixels, Point, Render, RenderImage, ResizeEdge, ScrollDelta, ScrollWheelEvent,
ParentElement, Pixels, Point, Render, RenderImage, ResizeEdge, ScrollDelta, ScrollEvent,
SharedString, Size, Stateful, Styled, Task, Window, WindowBackgroundAppearance, WindowBounds,
WindowKind, WindowOptions,
};
Expand Down Expand Up @@ -1709,7 +1709,7 @@ impl AgentWorkspaceViewer {

fn forward_scroll(
&mut self,
event: &ScrollWheelEvent,
event: &ScrollEvent,
_window: &mut Window,
cx: &mut Context<Self>,
) {
Expand Down Expand Up @@ -3338,7 +3338,7 @@ impl Render for AgentWorkspaceViewer {
// make human handoff feel noisy/laggy. Clicks still move the
// workspace pointer to the target point, and
// drag gestures are replayed on release.
.on_scroll_wheel(cx.listener(Self::forward_scroll))
.on_scroll(cx.listener(Self::forward_scroll))
.capture_key_down(cx.listener(Self::forward_key_down))
.child(match image {
Some(image) => img(image)
Expand Down
Loading