Skip to content

Fix native selection size badge label #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yvette-carlisle merged 1 commit into from
May 15, 2026
Merged

Fix native selection size badge label #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions native/macos-host/Sources/RsnapNativeHostKit/CaptureHostView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,8 +1928,7 @@ final class CaptureHostView: NSView {
}

private func drawSelectionSizeBadge(for rect: CGRect, in context: CGContext) {
let scale = window?.screen?.backingScaleFactor ?? 1
let text = "\(Int(round(rect.width * scale)))x\(Int(round(rect.height * scale)))"
let text = selectionSizeText(for: rect)
let font = Self.hudLayoutMetrics.font
let textSize = text.size(using: font)
let badgeFrame = CaptureChrome.selectionSizeBadgeFrame(
Expand Down Expand Up @@ -3286,7 +3285,13 @@ final class CaptureHostView: NSView {

private func selectionSizeText(for rect: CGRect) -> String {
let scale = window?.screen?.backingScaleFactor ?? 1
return "\(Int(round(rect.width * scale)))x\(Int(round(rect.height * scale)))"
let sizeText = "\(Int(round(rect.width * scale)))x\(Int(round(rect.height * scale)))px"

if abs(scale - 1) <= 0.005 {
return sizeText
}

return "\(sizeText) @\(String(format: "%g", Double(scale)))x"
}

private func currentPositionDisplay() -> LivePositionDisplay {
Expand Down
24 changes: 1 addition & 23 deletions packages/rsnap-overlay/src/overlay/rendering/affordances.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,30 +1269,8 @@ impl WindowRenderer {
size_points: RectPoints,
) -> String {
let size_pixels = monitor.local_rect_to_pixels(size_points);
let size_text = format!("{}x{} px", size_pixels.width, size_pixels.height);

if monitor.scale_factor_x1000 == 1_000 {
return size_text;
}

format!("{} @{}x", size_text, Self::selection_size_badge_scale_text(monitor))
}

fn selection_size_badge_scale_text(monitor: MonitorRect) -> String {
let scale_integer = monitor.scale_factor_x1000 / 1_000;
let scale_fraction = monitor.scale_factor_x1000 % 1_000;

if scale_fraction == 0 {
return scale_integer.to_string();
}

let mut scale_fraction_text = format!("{scale_fraction:03}");

while scale_fraction_text.ends_with('0') {
scale_fraction_text.pop();
}

format!("{scale_integer}.{scale_fraction_text}")
format!("{}x{}", size_pixels.width, size_pixels.height)
}

fn selection_size_badge_visual_overflow(pixels_per_point: f32) -> SelectionSizeBadgePadding {
Expand Down
26 changes: 5 additions & 21 deletions packages/rsnap-overlay/src/overlay/tests/rendering_behaviors/capture_affordances.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,34 +306,18 @@ fn selection_size_badge_reserved_rect_accepts_overlap_when_no_non_overlapping_sl

#[test]
fn selection_size_badge_text_uses_monitor_pixel_dimensions() {
let monitor = tests::test_monitor_with_scale(1_000, 800, 2_000);

assert_eq!(
WindowRenderer::selection_size_badge_text(
tests::test_monitor_with_scale(1_000, 800, 2_000),
RectPoints::new(10, 20, 120, 80),
),
"240x160 px @2x"
);
assert_eq!(
WindowRenderer::selection_size_badge_text(
tests::test_monitor_with_scale(1_000, 800, 1_500),
RectPoints::new(10, 20, 120, 80),
),
"180x120 px @1.5x"
);
assert_eq!(
WindowRenderer::selection_size_badge_text(
tests::test_monitor_with_scale(1_000, 800, 1_000),
RectPoints::new(10, 20, 120, 80),
),
"120x80 px"
WindowRenderer::selection_size_badge_text(monitor, RectPoints::new(10, 20, 120, 80)),
"240x160"
);
}

#[test]
fn selection_size_badge_layout_keeps_visual_bounds_inside_badge_rect() {
let ctx = tests::test_egui_context();
let layout =
WindowRenderer::selection_size_badge_layout(&ctx, "240x160 px @2x", HudTheme::Light, 1.0);
let layout = WindowRenderer::selection_size_badge_layout(&ctx, "240x160", HudTheme::Light, 1.0);
let screen_rect = Rect::from_min_size(Pos2::ZERO, Vec2::new(800.0, 600.0));

for (label, capture_rect) in [
Expand Down