theme: use semibold headlines and 24pt menu rows
This commit is contained in:
@@ -1103,7 +1103,7 @@ mod tests {
|
|||||||
stated.root_font_size = Some(px(13.));
|
stated.root_font_size = Some(px(13.));
|
||||||
let native = resolve(&stated, None, None, None);
|
let native = resolve(&stated, None, None, None);
|
||||||
assert_eq!(native.typography.body.size, px(13.));
|
assert_eq!(native.typography.body.size, px(13.));
|
||||||
assert_eq!(native.typography.headline.weight, FontWeight::BOLD);
|
assert_eq!(native.typography.headline.weight, FontWeight::SEMIBOLD);
|
||||||
|
|
||||||
// A custom root rescales the whole ladder off the platform's base.
|
// A custom root rescales the whole ladder off the platform's base.
|
||||||
let custom = CustomTheme {
|
let custom = CustomTheme {
|
||||||
|
|||||||
@@ -22,12 +22,12 @@ use crate::system::{AccessibilityPreferences, PartialPalette, SourceKind, System
|
|||||||
|
|
||||||
/// Default control radius for macOS controls.
|
/// Default control radius for macOS controls.
|
||||||
const CONTROL_RADIUS_PTS: f32 = 6.0;
|
const CONTROL_RADIUS_PTS: f32 = 6.0;
|
||||||
/// The rounded-bezel text field's intrinsic height at regular size.
|
/// The text field's intrinsic height at regular size, square or rounded bezel alike.
|
||||||
const INPUT_HEIGHT_PTS: f32 = 24.0;
|
const INPUT_HEIGHT_PTS: f32 = 24.0;
|
||||||
/// AppKit's regular push button, measured via `NSButton::fittingSize`.
|
/// AppKit's regular push button, measured via `NSButton::fittingSize`.
|
||||||
const CONTROL_HEIGHT_PTS: f32 = 24.0;
|
const CONTROL_HEIGHT_PTS: f32 = 24.0;
|
||||||
/// The standard `NSMenu` row height.
|
/// The `NSMenu` row height; 20 before the macOS 26 redesign.
|
||||||
const MENU_ITEM_HEIGHT_PTS: f32 = 20.0;
|
const MENU_ITEM_HEIGHT_PTS: f32 = 24.0;
|
||||||
/// `NSSwitch`, measured via `fittingSize`.
|
/// `NSSwitch`, measured via `fittingSize`.
|
||||||
const SWITCH_TRACK_HEIGHT_PTS: f32 = 24.0;
|
const SWITCH_TRACK_HEIGHT_PTS: f32 = 24.0;
|
||||||
const SWITCH_TRACK_WIDTH_PTS: f32 = 54.0;
|
const SWITCH_TRACK_WIDTH_PTS: f32 = 54.0;
|
||||||
|
|||||||
@@ -371,7 +371,7 @@ mod tests {
|
|||||||
TypeMetrics {
|
TypeMetrics {
|
||||||
size: px(13.0),
|
size: px(13.0),
|
||||||
line_height: px(16.0),
|
line_height: px(16.0),
|
||||||
weight: FontWeight::BOLD
|
weight: FontWeight::SEMIBOLD
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|||||||
Reference in New Issue
Block a user