1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
//! macOS rasteriser for [`crate::MenuBar`].
//!
//! Layout (`mac_menu_bar_layout`) stays here — it needs Core Text's own
//! measurement to size each item. Content painting (background,
//! active/disabled colouring, label text, Alt-key underline) moved to
//! the shared [`crate::primitives::menu_bar::native_surface_paint::paint`]
//! (#1081, `PaintSurface` Phase 4 slice 5/8), which also **closes this
//! backend's own documented gap**: pre-migration macOS painted no
//! Alt-key underline at all (Core Text's `kCTUnderlineStyleAttributeName`
//! needs attributed-string plumbing `super::text::draw_text` never had —
//! see this module's git history for the old "Scope omissions" doc).
//! The shared `paint` draws the underline as a manually-positioned
//! filled rectangle instead of a font-level attribute, so it needs
//! nothing beyond the measure/fill verbs every backend already has —
//! see that fn's module doc for the full three-way drift it resolved.
use core_graphics::sys::CGContextRef;
use core_text::font::CTFont;
use super::text::measure_text;
use crate::event::Rect as QRect;
use crate::primitives::menu_bar::{
native_surface_paint, MenuBar, MenuBarItemMeasure, MenuBarLayout,
};
use crate::theme::Theme;
/// 8-pt padding each side of the menu label inside its hit slot.
const ITEM_PAD: f32 = 8.0;
/// Compute the macOS pixel-unit layout for `bar` without painting.
/// Mirrors `crate::gtk::gtk_menu_bar_layout`. Apps call this to route
/// clicks via the same layout the rasteriser used.
pub fn mac_menu_bar_layout(
font: &CTFont,
x: f64,
y: f64,
width: f64,
height: f64,
bar: &MenuBar,
) -> MenuBarLayout {
let bounds = QRect::new(x as f32, y as f32, width as f32, height as f32);
bar.layout(bounds, |i| {
let text = display_text(&bar.items[i].label);
let (w, _) = measure_text(font, &text);
MenuBarItemMeasure::new(w as f32 + ITEM_PAD * 2.0)
})
}
/// Paint `bar` into `(x, y, width, height)` on `ctx`. Returns the
/// layout for caller click dispatch.
///
/// # Safety
///
/// `ctx` must be a valid `CGContextRef` borrowed for the duration of
/// the call.
#[allow(clippy::too_many_arguments)]
pub unsafe fn draw_menu_bar(
ctx: CGContextRef,
font: &CTFont,
x: f64,
y: f64,
width: f64,
height: f64,
bar: &MenuBar,
theme: &Theme,
) -> MenuBarLayout {
CGContextSaveGState(ctx);
let layout = mac_menu_bar_layout(font, x, y, width, height, bar);
let mut surface = super::surface::CgSurface {
ctx,
font: Some(font),
};
native_surface_paint::paint(bar, &layout, &mut surface, theme);
CGContextRestoreGState(ctx);
layout
}
/// Strip `&` markers from a label for display.
fn display_text(label: &str) -> String {
label.chars().filter(|&c| c != '&').collect()
}
extern "C" {
fn CGContextSaveGState(c: CGContextRef);
fn CGContextRestoreGState(c: CGContextRef);
}
#[cfg(test)]
mod tests {
use super::super::headless::BitmapSurface;
use super::super::text::make_font;
use super::super::MacBackend;
use super::*;
use crate::event::Viewport;
use crate::primitives::menu_bar::{MenuBar, MenuBarHit, MenuBarItem};
use crate::theme::Theme;
use crate::types::WidgetId;
use crate::Backend;
const W: u32 = 320;
const H: u32 = 24;
fn font() -> CTFont {
make_font("Menlo", 14.0).expect("Menlo installed")
}
fn sample_bar() -> MenuBar {
MenuBar {
id: WidgetId::new("menus"),
items: vec![
MenuBarItem {
id: WidgetId::new("menu:file"),
label: "&File".into(),
disabled: false,
submenu: None,
},
MenuBarItem {
id: WidgetId::new("menu:edit"),
label: "&Edit".into(),
disabled: false,
submenu: None,
},
MenuBarItem {
id: WidgetId::new("menu:view"),
label: "&View".into(),
disabled: true,
submenu: None,
},
],
open_item: Some(0),
focused_item: None,
}
}
fn paint_via_backend(bar: &MenuBar) -> (BitmapSurface, MenuBarLayout) {
let surface = BitmapSurface::new(W, H);
surface.fill(0.0, 0.0, 0.0, 0.0);
let mut backend = MacBackend::new();
backend.set_current_font(font());
backend.begin_frame(Viewport::new(W as f32, H as f32, 1.0));
let layout = std::cell::RefCell::new(None);
backend.enter_frame_scope(surface.context_ptr(), |b| {
let l = b.draw_menu_bar(QRect::new(0.0, 0.0, W as f32, H as f32), bar);
*layout.borrow_mut() = Some(l);
});
backend.end_frame();
(surface, layout.into_inner().unwrap())
}
#[test]
fn open_item_paints_active_bg() {
// First item (File) is the open menu — its bg should be
// tab_active_bg, distinct from tab_bar_bg.
let bar = sample_bar();
let (surface, layout) = paint_via_backend(&bar);
let theme = Theme::default();
let file = &layout.visible_items[0];
// Probe column 1 (inside the leading padding so no glyph
// ink) at the bottom edge of the bar.
let probe_x = (file.bounds.x as u32) + 1;
let probe_y = H - 2;
let (r, g, b, _) = surface.pixel(probe_x, probe_y);
assert_eq!(
(r, g, b),
(
theme.tab_active_bg.r,
theme.tab_active_bg.g,
theme.tab_active_bg.b
),
);
}
#[test]
fn inactive_item_paints_bar_bg() {
let bar = sample_bar();
let (surface, layout) = paint_via_backend(&bar);
let theme = Theme::default();
// Second item (Edit) is inactive — its bg should still be
// tab_bar_bg (not painted over).
let edit = &layout.visible_items[1];
let probe_x = (edit.bounds.x as u32) + 1;
let probe_y = H - 2;
let (r, g, b, _) = surface.pixel(probe_x, probe_y);
assert_eq!(
(r, g, b),
(theme.tab_bar_bg.r, theme.tab_bar_bg.g, theme.tab_bar_bg.b),
);
}
/// Regression guard for #1081: pre-migration macOS painted **no**
/// Alt-key underline at all (see this module's doc comment above —
/// Core Text's attributed-string underline plumbing never existed
/// here). Mirrors `gtk::menu_bar::tests::
/// draw_menu_bar_paints_alt_underline_beneath_activation_char`, but
/// runs through the real `draw_menu_bar` → `CgSurface` → CGContext
/// path instead of a synthetic `RecordingSurface`, so it actually
/// proves the macOS backend now paints the pixel, not just that the
/// shared `native_surface_paint::paint` fn computes the right rect.
///
/// Deliberately does **not** recompute `text_x`/`text_y` via its own
/// `measure_text(&font(), ..)` call — that assumes the test's font
/// matches whatever the backend actually painted with, which drifted
/// after per-backend platform font defaults (#1156) started
/// overriding `set_current_font`. Instead it scans directly inside
/// the item's *layout* bounds (which the real paint call already
/// resolved) for a horizontal run of contiguous `tab_active_fg`
/// pixels in the lower half of the item. The underline is a solid
/// filled rect (`native_surface_paint::paint`'s `UNDERLINE_HEIGHT`
/// bar), so it always yields a long contiguous run of matching
/// pixels; individual glyph strokes (same colour) don't — "F"'s
/// vertical stem is only 2-3px wide, and its horizontal bars sit in
/// the upper half of the glyph, above the baseline the underline
/// sits under.
#[test]
fn open_item_paints_alt_underline_beneath_activation_char() {
let bar = sample_bar();
let (surface, layout) = paint_via_backend(&bar);
let theme = Theme::default();
// File ("&File") is the open item.
let file = &layout.visible_items[0];
let x0 = file.bounds.x.floor() as u32;
let x1 = ((file.bounds.x + file.bounds.width).ceil() as u32).min(W);
let y_mid = (file.bounds.y + file.bounds.height / 2.0).floor() as u32;
let y1 = ((file.bounds.y + file.bounds.height).ceil() as u32).min(H);
const MIN_RUN: u32 = 3;
let target = (
theme.tab_active_fg.r,
theme.tab_active_fg.g,
theme.tab_active_fg.b,
);
let mut best_run = 0u32;
for row in y_mid..y1 {
let mut run = 0u32;
for x in x0..x1 {
let (r, g, b, _) = surface.pixel(x, row);
if (r, g, b) == target {
run += 1;
best_run = best_run.max(run);
} else {
run = 0;
}
}
}
assert!(
best_run >= MIN_RUN,
"expected a contiguous run of >= {MIN_RUN} {target:?} pixels in the lower half \
of the File item (columns {x0}..{x1}, rows {y_mid}..{y1}); found longest run \
of {best_run}",
);
}
/// `cargo test -p quadraui --features macos -- --ignored --nocapture macos::menu_bar::tests::dump_smoke_ppm`
///
/// Paints the sample bar (File / Edit / View, File open) into a
/// 320 × 24 surface and writes `/tmp/quadraui_menu_bar.ppm`. Open
/// in Preview to confirm:
/// - "File" reads in `tab_active_fg` over `tab_active_bg` (the
/// open-menu highlight).
/// - "Edit" reads in `tab_inactive_fg` over the bar's normal bg.
/// - "View" (disabled) reads dimmer (`muted_fg`).
/// - `&` markers are stripped from rendered text.
#[test]
#[ignore = "writes /tmp/quadraui_menu_bar.ppm — opt in with --ignored"]
fn dump_smoke_ppm() {
let bar = sample_bar();
let (surface, _) = paint_via_backend(&bar);
surface.write_ppm_and_open("/tmp/quadraui_menu_bar.ppm");
}
#[test]
fn hit_test_resolves_clickable_items_via_layout() {
let bar = sample_bar();
let (_surface, layout) = paint_via_backend(&bar);
// Clickable items (File, Edit) resolve as Item(i). Disabled
// View falls through to Bar — matches the primitive contract.
for (i, vi) in layout.visible_items.iter().enumerate() {
let cx = vi.bounds.x + vi.bounds.width * 0.5;
let cy = vi.bounds.y + vi.bounds.height * 0.5;
let expected = if vi.clickable {
MenuBarHit::Item(i)
} else {
MenuBarHit::Bar
};
assert_eq!(
layout.hit_test(cx, cy),
expected,
"item {} (clickable={})",
i,
vi.clickable
);
}
}
#[test]
fn hit_test_resolves_clickable_items_at_nonzero_origin() {
// Regression for quadraui#494 / LESSONS.md "Layout helpers must
// return coords in the same frame across backends": every other
// test in this file lays out at origin (0, 0). `mac_menu_bar_
// layout` bakes `x`/`y` straight into `visible_items[].bounds`
// (absolute frame, matching the GTK/TUI twins) via
// `MenuBar::layout`, whose cursor starts at `bounds.x` — call it
// directly (pure fn, no paint needed) at a non-zero origin and
// prove hit_test still resolves the right item.
let bar = sample_bar();
let f = font();
let origin_x = 7.0;
let origin_y = 13.0;
let layout = mac_menu_bar_layout(&f, origin_x, origin_y, W as f64, H as f64, &bar);
for (i, vi) in layout.visible_items.iter().enumerate() {
let cx = vi.bounds.x + vi.bounds.width * 0.5;
let cy = vi.bounds.y + vi.bounds.height * 0.5;
let expected = if vi.clickable {
MenuBarHit::Item(i)
} else {
MenuBarHit::Bar
};
assert_eq!(
layout.hit_test(cx, cy),
expected,
"item {} (clickable={})",
i,
vi.clickable
);
}
}
}