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
3 changes: 1 addition & 2 deletions packages/rsnap-overlay/src/overlay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ use self::rendering::{
};
#[cfg(test)]
use self::rendering::{
SelectionDashedBorderCache, SelectionDashedBorderMetrics, SelectionFlowGeometryCache,
SelectionSizeBadgeTarget,
SelectionDashedBorderCache, SelectionFlowGeometryCache, SelectionSizeBadgeTarget,
};
#[cfg(all(target_os = "macos", test))]
use self::session_state::InflightScrollCaptureObservation;
Expand Down
5 changes: 2 additions & 3 deletions packages/rsnap-overlay/src/overlay/aux_window_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#[allow(unused_imports)]
use crate::overlay::{
Duration, Event, FROZEN_TEXT_CARET_REPAINT_INTERVAL, GlobalPoint, HUD_LOUPE_MOVE_INTERVAL_MIN,
Duration, FROZEN_TEXT_CARET_REPAINT_INTERVAL, GlobalPoint, HUD_LOUPE_MOVE_INTERVAL_MIN,
INTERACTIVE_REPAINT_FPS_CAP, Instant, LOUPE_WINDOW_WARMUP_REDRAWS, LogicalPosition,
MonitorRect, MonitorRectPoints, OVERLAY_EVENT_LOOP_STALL_THRESHOLD, Ordering, OverlayControl,
OverlayEventLoopPhase, OverlayMode, OverlaySession, SLOW_OP_WARN_INTERVAL,
SLOW_OP_WARN_OUTER_POSITION, WindowEvent, scroll_capture,
SLOW_OP_WARN_OUTER_POSITION, WindowEvent,
};

impl OverlaySession {
Expand Down
5 changes: 3 additions & 2 deletions packages/rsnap-overlay/src/overlay/capture_window_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#[allow(unused_imports)]
use crate::overlay::{GlobalPoint, Instant, MonitorRect, OverlayMode, OverlaySession};
#[cfg(target_os = "macos")]
use crate::overlay::Instant;
use crate::overlay::{GlobalPoint, MonitorRect, OverlayMode, OverlaySession};

impl OverlaySession {
pub(super) fn update_cursor_state(&mut self, monitor: MonitorRect, cursor: GlobalPoint) {
Expand Down
8 changes: 4 additions & 4 deletions packages/rsnap-overlay/src/overlay/config_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ use winit::window::WindowId;

#[cfg(target_os = "macos")]
use crate::backend;
#[allow(unused_imports)]
#[cfg(target_os = "macos")]
use crate::overlay::{self, OverlayWorker};
use crate::overlay::{
self, Arc, HUD_PILL_CORNER_RADIUS_POINTS, Instant, LOUPE_TILE_CORNER_RADIUS_POINTS,
OverlayConfig, OverlayMode, OverlaySession, OverlayWorker, scroll_capture,
Arc, HUD_PILL_CORNER_RADIUS_POINTS, Instant, LOUPE_TILE_CORNER_RADIUS_POINTS, OverlayConfig,
OverlayMode, OverlaySession,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::{MacLiveFrameStream, MacOSHudWindowConfigState, SLOW_OP_WARN_HUD_CONFIG};

impl OverlaySession {
Expand Down
2 changes: 0 additions & 2 deletions packages/rsnap-overlay/src/overlay/cursor_context_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::{CursorSampleRequest, StartupLiveRgbPlan};
#[allow(unused_imports)]
use crate::overlay::{
DeviceCursorPointSource, FreezeCaptureTarget, GlobalPoint, Instant,
LIVE_EVENT_CURSOR_CACHE_TTL, MonitorRect, OverlayMode, OverlaySession,
Expand Down
1 change: 0 additions & 1 deletion packages/rsnap-overlay/src/overlay/cursor_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#[allow(unused_imports)]
use crate::overlay::{
CURSOR_POLL_INTERVAL_MIN, DeviceCursorPointSource, Duration, GlobalPoint, Instant,
LIVE_HOVER_HIT_TEST_INTERVAL, MonitorRect, OverlayMode, OverlaySession,
Expand Down
2 changes: 0 additions & 2 deletions packages/rsnap-overlay/src/overlay/hud_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#[allow(unused_imports)]
use crate::overlay::{
Duration, FrozenCaptureSource, GlobalPoint, HudAnchor, HudPillGeometry, HudRedrawSummary,
Instant, LIVE_PRESENT_INTERVAL_MIN, LogicalSize, MonitorRect, OverlayControl,
OverlayEventLoopPhase, OverlayExit, OverlayMode, OverlaySession, Pos2, Rect, Result, eyre,
scroll_capture,
};

impl OverlaySession {
Expand Down
18 changes: 8 additions & 10 deletions packages/rsnap-overlay/src/overlay/rendering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use self::hud_rendering::LiveLoupeTexture;
use self::hud_surface::{HudBg, HudBlurUniformRaw};
#[cfg(target_os = "macos")]
use crate::overlay::MacOSOverlayCursorRectSupport;
#[allow(unused_imports)]
use crate::overlay::{
self, AcquiredSurfaceFrame, Adapter, AddressMode, Arc, BindGroupLayout, BindingResource,
BindingType, BlendState, Buffer, BufferBindingType, BufferSize, BufferUsages, ClippedPrimitive,
Expand All @@ -21,15 +20,14 @@ use crate::overlay::{
FrozenBrushState, FrozenCaptureSource, FrozenEditKind, FrozenSelectionCorner,
FrozenTextAnnotation, FrozenTextEditState, FrozenTextStyle, FrozenToolbarPointerState,
FrozenToolbarState, FullOutput, HudAnchor, HudTheme, Id, Instant, LayerId, LoadOp, MemoryHints,
MipmapFilterMode, MonitorRect, MultisampleState, Mutex, Order, OverlayMode, OverlaySession,
OverlayState, PhysicalSize, PipelineCompilationOptions, PointerButton, PolygonMode, Pos2,
PowerPreference, PresentMode, PrimitiveTopology, Queue, Rect, RectPoints, RenderPipeline,
Renderer, Result, SLOW_OP_WARN_RENDER, Sampler, SamplerBindingType, ScreenDescriptor,
ShaderSource, ShaderStages, SlowOperationLogger, StoreOp, Surface, SurfaceCapabilities,
SurfaceFrameSkipReason, SurfaceTexture, Texture, TextureAspect, TextureSampleType,
TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension, ThemeMode,
ToolbarPlacement, Trace, Variant, Vec2, ViewportId, Visuals, WindowId, WindowRendererPath,
WrapErr, eyre, hud_helpers, mem,
MipmapFilterMode, MonitorRect, MultisampleState, Mutex, Order, OverlayMode, OverlayState,
PhysicalSize, PipelineCompilationOptions, PointerButton, PolygonMode, Pos2, PowerPreference,
PresentMode, PrimitiveTopology, Queue, Rect, RectPoints, RenderPipeline, Renderer, Result,
SLOW_OP_WARN_RENDER, Sampler, SamplerBindingType, ScreenDescriptor, ShaderSource, ShaderStages,
SlowOperationLogger, StoreOp, Surface, SurfaceCapabilities, SurfaceFrameSkipReason,
SurfaceTexture, Texture, TextureAspect, TextureSampleType, TextureUsages,
TextureViewDescriptor, TextureViewDimension, ThemeMode, ToolbarPlacement, Trace, Variant, Vec2,
ViewportId, Visuals, WindowId, WindowRendererPath, WrapErr, eyre, hud_helpers, mem,
};
use crate::system_fonts;

Expand Down
46 changes: 22 additions & 24 deletions packages/rsnap-overlay/src/overlay/rendering/affordances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ use egui::Galley;
use egui::RawInput;
use egui::text::CCursor;

#[allow(unused_imports)]
use crate::overlay::rendering::{
FrozenSelectionResizeHandleGeometry, FrozenToolbarButtonStyle, SelectionDashedBorderCache,
SelectionDashedBorderCacheKey, SelectionDashedBorderMetrics, SelectionFlowGeometryCache,
SelectionFlowGeometryCacheKey, SelectionSizeBadgeLayout, SelectionSizeBadgePadding,
SelectionSizeBadgeTarget, WindowRenderer,
};
#[allow(unused_imports)]
use crate::overlay::{
self, Align, Align2, Area, Color32, CornerRadius, FROZEN_BRUSH_COLOR_RGBA,
FROZEN_BRUSH_STROKE_WIDTH_POINTS, FROZEN_SELECTION_DASHED_BORDER_WIDTH_PX,
Expand All @@ -25,28 +23,28 @@ use crate::overlay::{
FROZEN_SELECTION_RESIZE_HANDLE_INTERIOR_REACH_MAX_POINTS,
FROZEN_SELECTION_RESIZE_HANDLE_OUTER_RADIUS_POINTS,
FROZEN_SELECTION_RESIZE_HANDLE_STROKE_WIDTH_POINTS, FROZEN_SELECTION_SCRIM_ALPHA_DARK,
FROZEN_SELECTION_SCRIM_ALPHA_LIGHT, FROZEN_TEXT_FONT_SIZE_POINTS,
FROZEN_TEXT_FONT_SIZE_PRESETS, FROZEN_TEXT_PREVIEW_PLACEHOLDER,
FROZEN_TOOLBAR_BUTTON_SIZE_POINTS, FROZEN_TOOLBAR_ITEM_SPACING_POINTS, FontFamily, FontId,
FrozenBrushState, FrozenCaptureSource, FrozenCommittedOverlay, FrozenEditKind,
FrozenSelectionCorner, FrozenTextAnnotation, FrozenTextColor, FrozenTextEditState,
FrozenTextStyle, FrozenToolbarPointerState, FrozenToolbarState, FrozenToolbarTool,
HUD_PILL_CORNER_RADIUS_POINTS, HUD_PILL_INNER_MARGIN_X_POINTS, HUD_PILL_INNER_MARGIN_Y_POINTS,
HUD_PILL_STROKE_WIDTH_POINTS, HudPillGeometry, HudTheme, Id,
LIVE_DRAG_SELECTION_SCRIM_ALPHA_DARK, LIVE_DRAG_SELECTION_SCRIM_ALPHA_LIGHT,
LIVE_DRAG_START_THRESHOLD_PX, LayerId, Layout, Mesh, MonitorRect, Order, OverlayMode,
OverlaySession, OverlayState, Painter, Pos2, Rect, RectPoints, SELECTION_DASHED_BORDER_ALPHA,
SELECTION_DASHED_BORDER_DASH_LENGTH_PX, SELECTION_DASHED_BORDER_GAP_LENGTH_PX,
SELECTION_DASHED_BORDER_WIDTH_PX, SELECTION_FLOW_CORE_FLOW_WIDTH,
SELECTION_FLOW_CORNER_RADIUS_PX, SELECTION_FLOW_FLOW_BOOST, SELECTION_FLOW_LIGHT_PALETTE,
SELECTION_FLOW_MAX_SEGMENTS, SELECTION_FLOW_MIN_SEGMENTS, SELECTION_FLOW_PALETTE,
SELECTION_FLOW_SAMPLE_STEP_PX, SELECTION_FLOW_SPEED, SELECTION_SIZE_BADGE_FAR_SHADOW_OFFSET_PX,
SELECTION_SIZE_BADGE_FONT_SIZE_POINTS, SELECTION_SIZE_BADGE_GAP_PX,
SELECTION_SIZE_BADGE_INSIDE_MARGIN_PX, SELECTION_SIZE_BADGE_NEAR_SHADOW_OFFSET_PX,
SELECTION_SIZE_BADGE_OUTLINE_OFFSET_PX, SELECTION_SIZE_BADGE_SCREEN_MARGIN_PX,
SELECTION_SIZE_BADGE_TEXT_OUTSET_POINTS, SelectionFlowStyle, Sense, Shape, Stroke, StrokeKind,
TOOLBAR_CAPTURE_GAP_PX, TOOLBAR_EXPANDED_HEIGHT_PX, TOOLBAR_SCREEN_MARGIN_PX, ToolbarPlacement,
Ui, UiBuilder, Vec2, regular,
FROZEN_SELECTION_SCRIM_ALPHA_LIGHT, FROZEN_TEXT_FONT_SIZE_PRESETS,
FROZEN_TEXT_PREVIEW_PLACEHOLDER, FROZEN_TOOLBAR_BUTTON_SIZE_POINTS,
FROZEN_TOOLBAR_ITEM_SPACING_POINTS, FontFamily, FontId, FrozenBrushState, FrozenCaptureSource,
FrozenCommittedOverlay, FrozenEditKind, FrozenSelectionCorner, FrozenTextAnnotation,
FrozenTextColor, FrozenTextEditState, FrozenTextStyle, FrozenToolbarPointerState,
FrozenToolbarState, FrozenToolbarTool, HUD_PILL_CORNER_RADIUS_POINTS,
HUD_PILL_INNER_MARGIN_X_POINTS, HUD_PILL_INNER_MARGIN_Y_POINTS, HUD_PILL_STROKE_WIDTH_POINTS,
HudPillGeometry, HudTheme, Id, LIVE_DRAG_SELECTION_SCRIM_ALPHA_DARK,
LIVE_DRAG_SELECTION_SCRIM_ALPHA_LIGHT, LIVE_DRAG_START_THRESHOLD_PX, LayerId, Layout, Mesh,
MonitorRect, Order, OverlayMode, OverlaySession, OverlayState, Painter, Pos2, Rect, RectPoints,
SELECTION_DASHED_BORDER_ALPHA, SELECTION_DASHED_BORDER_DASH_LENGTH_PX,
SELECTION_DASHED_BORDER_GAP_LENGTH_PX, SELECTION_DASHED_BORDER_WIDTH_PX,
SELECTION_FLOW_CORE_FLOW_WIDTH, SELECTION_FLOW_CORNER_RADIUS_PX, SELECTION_FLOW_FLOW_BOOST,
SELECTION_FLOW_LIGHT_PALETTE, SELECTION_FLOW_MAX_SEGMENTS, SELECTION_FLOW_MIN_SEGMENTS,
SELECTION_FLOW_PALETTE, SELECTION_FLOW_SAMPLE_STEP_PX, SELECTION_FLOW_SPEED,
SELECTION_SIZE_BADGE_FAR_SHADOW_OFFSET_PX, SELECTION_SIZE_BADGE_FONT_SIZE_POINTS,
SELECTION_SIZE_BADGE_GAP_PX, SELECTION_SIZE_BADGE_INSIDE_MARGIN_PX,
SELECTION_SIZE_BADGE_NEAR_SHADOW_OFFSET_PX, SELECTION_SIZE_BADGE_OUTLINE_OFFSET_PX,
SELECTION_SIZE_BADGE_SCREEN_MARGIN_PX, SELECTION_SIZE_BADGE_TEXT_OUTSET_POINTS,
SelectionFlowStyle, Sense, Shape, Stroke, StrokeKind, TOOLBAR_CAPTURE_GAP_PX,
TOOLBAR_EXPANDED_HEIGHT_PX, TOOLBAR_SCREEN_MARGIN_PX, ToolbarPlacement, Ui, UiBuilder, Vec2,
regular,
};

const FROZEN_TEXT_TOOLBAR_SECTION_GAP_POINTS: f32 = 8.0;
Expand Down
2 changes: 0 additions & 2 deletions packages/rsnap-overlay/src/overlay/rendering/hud_rendering.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use egui::Context;

#[allow(unused_imports)]
use crate::overlay::rendering::WindowRenderer;
#[allow(unused_imports)]
use crate::overlay::{
Align, Area, Color32, ColorImage, CornerRadius, Frame, GlobalPoint, HUD_LOUPE_STRIP_GAP_POINTS,
HUD_PILL_CORNER_RADIUS_POINTS, HudAnchor, HudPillGeometry, HudTheme, Id, Layout, Margin,
Expand Down
9 changes: 3 additions & 6 deletions packages/rsnap-overlay/src/overlay/rendering/hud_surface.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
use egui::RawInput;
use wgpu::{BindGroup, TextureFormat};

#[allow(unused_imports)]
use crate::overlay::rendering::{GpuContext, WindowRenderer, WindowRendererPhaseTimings};
#[allow(unused_imports)]
use crate::overlay::{
Area, BindingResource, Color32, CornerRadius, Frame, FullOutput, HudDrawConfig, HudTheme, Id,
Instant, LOUPE_TILE_CORNER_RADIUS_POINTS, Margin, MonitorRect, Order, Origin3d, OverlayMode,
OverlayState, PhysicalSize, Pos2, Rect, Result, Rgb, RgbaImage, Sampler, StoreOp, Stroke,
StrokeKind, Texture, TextureAspect, TextureDimension, TextureUsages, TextureView,
TextureViewDescriptor, ThemeMode, Vec2, WindowRendererPath, hud_helpers, image_helpers, mem,
ptr, slice,
OverlayState, PhysicalSize, Pos2, Rect, Result, Rgb, RgbaImage, Stroke, StrokeKind, Texture,
TextureAspect, TextureDimension, TextureUsages, TextureView, TextureViewDescriptor, ThemeMode,
Vec2, WindowRendererPath, hud_helpers, image_helpers, mem, ptr, slice,
};

impl WindowRenderer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use wgpu::SurfaceConfiguration;

#[allow(unused_imports)]
#[cfg(target_os = "macos")]
use crate::overlay;
use crate::overlay::rendering::{GpuContext, ScrollPreviewView, WindowRenderer};
#[allow(unused_imports)]
use crate::overlay::{
self, AcquiredSurfaceFrame, ActiveEventLoop, Align, Arc, CentralPanel, Color32, ColorImage,
AcquiredSurfaceFrame, ActiveEventLoop, Align, Arc, CentralPanel, Color32, ColorImage,
CornerRadius, CurrentSurfaceTexture, FontDefinitions, Frame, FullOutput, HudTheme, Layout,
LoadOp, LogicalSize, Margin, PhysicalSize, Renderer, Result, RgbaImage,
SCROLL_PREVIEW_WINDOW_HEIGHT_POINTS, SCROLL_PREVIEW_WINDOW_WIDTH_POINTS, ScreenDescriptor,
StoreOp, Stroke, Surface, SurfaceFrameSkipReason, TextureHandle, TextureOptions,
TextureViewDescriptor, Variant, Vec2, ViewportId, Visuals, WindowEvent, WindowLevel, WrapErr,
eyre, image_helpers,
TextureViewDescriptor, Vec2, ViewportId, Visuals, WindowEvent, WindowLevel, WrapErr, eyre,
image_helpers,
};

pub(in crate::overlay) struct ScrollPreviewWindow {
Expand Down
12 changes: 6 additions & 6 deletions packages/rsnap-overlay/src/overlay/scroll_preview_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#[allow(unused_imports)]
use crate::overlay::{
ElementState, LogicalPosition, LogicalSize, MonitorRect, MouseButton, OverlayControl,
OverlayExit, OverlaySession, Pos2, Rect, RgbaImage, SCROLL_CAPTURE_PREVIEW_WIDTH_PX,
SCROLL_PREVIEW_WINDOW_HEIGHT_POINTS, SCROLL_PREVIEW_WINDOW_MARGIN_POINTS,
SCROLL_PREVIEW_WINDOW_WIDTH_POINTS, ScrollPreviewView, Vec2, WindowEvent, WindowId,
hud_helpers, scroll_capture,
ElementState, MonitorRect, MouseButton, OverlayControl, OverlayExit, OverlaySession, Pos2,
Rect, RgbaImage, SCROLL_CAPTURE_PREVIEW_WIDTH_PX, SCROLL_PREVIEW_WINDOW_HEIGHT_POINTS,
SCROLL_PREVIEW_WINDOW_MARGIN_POINTS, SCROLL_PREVIEW_WINDOW_WIDTH_POINTS, ScrollPreviewView,
Vec2, WindowEvent, WindowId, hud_helpers, scroll_capture,
};
#[cfg(target_os = "macos")]
use crate::overlay::{LogicalPosition, LogicalSize};

impl OverlaySession {
pub(super) fn sync_scroll_preview_segments(&mut self) {
Expand Down
10 changes: 4 additions & 6 deletions packages/rsnap-overlay/src/overlay/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,11 @@ use crate::overlay::{
FrozenMosaicEdit, FrozenSelectionDragState, FrozenTextAnnotation, FrozenTextColor,
FrozenTextEditState, FrozenTextInputSource, FrozenToolbarState, FrozenToolbarTool,
HUD_LOUPE_STRIP_GAP_POINTS, HudRedrawSummary, HudTheme, OCCLUDED_FRAME_REDRAW_RETRY_WINDOW,
OverlaySession, Pos2, Rect, SCROLL_CAPTURE_SAMPLE_INTERVAL,
SELECTION_DASHED_BORDER_DASH_LENGTH_PX, SELECTION_DASHED_BORDER_GAP_LENGTH_PX,
SELECTION_DASHED_BORDER_WIDTH_PX, SELECTION_SIZE_BADGE_GAP_PX,
OverlaySession, Pos2, Rect, SCROLL_CAPTURE_SAMPLE_INTERVAL, SELECTION_SIZE_BADGE_GAP_PX,
SELECTION_SIZE_BADGE_INSIDE_MARGIN_PX, SELECTION_SIZE_BADGE_SCREEN_MARGIN_PX,
SelectionDashedBorderCache, SelectionDashedBorderMetrics, SelectionFlowGeometryCache,
SelectionSizeBadgeTarget, SurfaceFrameSkipReason, TOOLBAR_CAPTURE_GAP_PX,
TOOLBAR_SCREEN_MARGIN_PX, ToolbarPlacement, Vec2, WindowRenderer, hud_helpers,
SelectionDashedBorderCache, SelectionFlowGeometryCache, SelectionSizeBadgeTarget,
SurfaceFrameSkipReason, TOOLBAR_CAPTURE_GAP_PX, TOOLBAR_SCREEN_MARGIN_PX, ToolbarPlacement,
Vec2, WindowRenderer, hud_helpers,
};
#[cfg(target_os = "macos")]
use crate::overlay::{
Expand Down
14 changes: 6 additions & 8 deletions packages/rsnap-overlay/src/overlay/tests/live_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ use crate::overlay::DeviceCursorPointSource;
#[cfg(target_os = "macos")]
use crate::overlay::FrozenCaptureSource;
use crate::overlay::OverlayControl;
#[allow(unused_imports)]
use crate::overlay::tests::{
self, Duration, GlobalPoint, HudRedrawSummary, Instant, LoupeSample, MonitorRect,
MonitorRectPoints, OverlayMode, OverlaySession, OverlayState, Pos2, Rect, RectPoints, Rgb,
Vec2, WindowRenderer, hud_helpers, overlay,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{
AltActivationMode, HUD_PILL_CORNER_RADIUS_POINTS, HudPillGeometry, LiveCursorSample,
self, AltActivationMode, HUD_PILL_CORNER_RADIUS_POINTS, HudPillGeometry, LiveCursorSample,
LiveSampleApplyResult, ModifiersState, OverlayExit, StartupLiveRgbPlan, WindowId,
};
use crate::overlay::tests::{
Duration, GlobalPoint, HudRedrawSummary, Instant, LoupeSample, MonitorRect, MonitorRectPoints,
OverlayMode, OverlaySession, OverlayState, Pos2, Rect, RectPoints, Rgb, Vec2, WindowRenderer,
hud_helpers,
};

#[cfg(target_os = "macos")]
#[test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ use objc::runtime::Object;
use winit::window::CursorIcon;

use crate::OverlayControl;
#[allow(unused_imports)]
use crate::overlay::tests::{
self, Duration, ElementState, FrozenCaptureSource, FrozenSelectionDragState,
FrozenToolbarState, FrozenToolbarTool, GlobalPoint, HUD_LOUPE_STRIP_GAP_POINTS, HudTheme,
MonitorRect, MonitorRectPoints, MouseButton, OverlayMode, OverlaySession, OverlayState,
PngAction, Pos2, RawInput, Rect, RectPoints, Rgba, SELECTION_DASHED_BORDER_DASH_LENGTH_PX,
SELECTION_DASHED_BORDER_GAP_LENGTH_PX, SELECTION_DASHED_BORDER_WIDTH_PX,
SELECTION_SIZE_BADGE_GAP_PX, SELECTION_SIZE_BADGE_INSIDE_MARGIN_PX,
SELECTION_SIZE_BADGE_SCREEN_MARGIN_PX, ScrollSession, SelectionDashedBorderCache,
SelectionDashedBorderMetrics, SelectionFlowGeometryCache, SelectionSizeBadgeTarget,
PngAction, Pos2, Rect, RectPoints, Rgba, SELECTION_SIZE_BADGE_GAP_PX,
SELECTION_SIZE_BADGE_INSIDE_MARGIN_PX, SELECTION_SIZE_BADGE_SCREEN_MARGIN_PX, ScrollSession,
SelectionDashedBorderCache, SelectionFlowGeometryCache, SelectionSizeBadgeTarget,
TOOLBAR_CAPTURE_GAP_PX, TOOLBAR_SCREEN_MARGIN_PX, ToolbarPlacement, Vec2, WindowRenderer,
overlay,
};
Expand Down
10 changes: 5 additions & 5 deletions packages/rsnap-overlay/src/overlay/tests/scroll_input_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#[allow(unused_imports)]
use crate::overlay::tests::{
self, Duration, GlobalPoint, Instant, MonitorRect, MouseScrollDelta, OverlaySession,
RectPoints, ScrollDirection, ScrollObserveOutcome, ScrollSession, overlay,
self, GlobalPoint, Instant, MonitorRect, MouseScrollDelta, OverlaySession, RectPoints,
ScrollDirection, ScrollObserveOutcome, ScrollSession,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{Arc, OverlayControl, SCROLL_CAPTURE_MOUSE_PASSTHROUGH_IDLE_GRACE};
use crate::overlay::tests::{
Arc, Duration, OverlayControl, SCROLL_CAPTURE_MOUSE_PASSTHROUGH_IDLE_GRACE,
};

#[cfg(target_os = "macos")]
#[test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@ use std::ptr;
#[cfg(target_os = "macos")]
use crate::overlay::RectPoints;
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::WorkerRequestSendError;
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{
self, Arc, InflightScrollCaptureObservation, OverlayControl, ScrollCaptureLiveFrame,
WindowListSnapshot, WindowRect,
self, Arc, InflightScrollCaptureObservation, ScrollCaptureLiveFrame, WindowListSnapshot,
WindowRect,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{
GlobalPoint, Instant, OverlaySession, ScrollDirection, WorkerErrorSource, WorkerResponse,
overlay,
};
#[cfg(target_os = "macos")]
use crate::overlay::worker_runtime::FREEZE_CAPTURE_SEND_FULL_RETRY_LIMIT;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{
self, Arc, MacLiveFrameStream, OverlayControl,
SCROLL_CAPTURE_ACTIVE_GESTURE_STALE_REFRESH_DEAD_WINDOW, SCROLL_CAPTURE_INPUT_FRESHNESS,
ScrollCaptureLiveFrame,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{
Duration, GlobalPoint, Instant, MonitorRect, OverlaySession, RectPoints, ScrollDirection,
ScrollSession, overlay,
ScrollSession,
};

#[cfg(target_os = "macos")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{
self, Duration, GlobalPoint, Instant, MonitorRect, OverlaySession, RectPoints, ScrollDirection,
ScrollObserveOutcome, ScrollSession, overlay,
ScrollObserveOutcome, ScrollSession,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{InflightScrollCaptureObservation, SCROLL_CAPTURE_INPUT_FRESHNESS};

#[cfg(target_os = "macos")]
Expand Down
11 changes: 5 additions & 6 deletions packages/rsnap-overlay/src/overlay/tests/worker_tick_runtime.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#[allow(unused_imports)]
#[cfg(target_os = "macos")]
use crate::overlay::tests::{
self, Duration, GlobalPoint, Instant, MonitorRect, OverlaySession, RectPoints,
SCROLL_CAPTURE_SAMPLE_INTERVAL, ScrollDirection, ScrollObserveOutcome, ScrollSession, overlay,
self, Arc, GlobalPoint, Instant, MacLiveFrameStream, MonitorRect, OverlaySession,
OverlayWorker, RectPoints, ScrollDirection, ScrollObserveOutcome, ScrollSession,
SequenceScrollCaptureBackend,
};
#[cfg(target_os = "macos")]
#[allow(unused_imports)]
use crate::overlay::tests::{Arc, MacLiveFrameStream, OverlayWorker, SequenceScrollCaptureBackend};
use crate::overlay::tests::{Duration, SCROLL_CAPTURE_SAMPLE_INTERVAL};

#[cfg(target_os = "macos")]
#[test]
Expand Down
Loading
Loading