Skip to content

Menu bar: numbers in 9 pt medium #373

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
fylorn merged 1 commit into from
Oct 25, 2026
Merged

Menu bar: numbers in 9 pt medium #373

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
16 changes: 10 additions & 6 deletions src-tauri/src/menubar/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ use objc2_app_kit::{
NSAlert, NSAlertFirstButtonReturn, NSAlertSecondButtonReturn, NSAlertStyle,
NSAppearanceCustomization, NSApplication, NSAttributedStringNSStringDrawing, NSBezierPath,
NSColor, NSCompositingOperation, NSControlStateValueOff, NSControlStateValueOn, NSEvent,
NSEventMask, NSEventModifierFlags, NSFont, NSFontAttributeName, NSFontWeightRegular,
NSFontWeightSemibold, NSForegroundColorAttributeName, NSGradient, NSGraphicsContext, NSImage,
NSImageSymbolConfiguration, NSLineCapStyle, NSLineJoinStyle, NSMenu, NSMenuDelegate,
NSMenuItem, NSStatusBar, NSStatusItem, NSVariableStatusItemLength, NSWorkspace,
NSEventMask, NSEventModifierFlags, NSFont, NSFontAttributeName, NSFontWeightMedium,
NSFontWeightRegular, NSFontWeightSemibold, NSForegroundColorAttributeName, NSGradient,
NSGraphicsContext, NSImage, NSImageSymbolConfiguration, NSLineCapStyle, NSLineJoinStyle,
NSMenu, NSMenuDelegate, NSMenuItem, NSStatusBar, NSStatusItem, NSVariableStatusItemLength,
NSWorkspace,
};
use objc2_foundation::{
NSArray, NSAttributedString, NSDictionary, NSNumber, NSObject, NSObjectProtocol, NSPoint,
Expand Down Expand Up @@ -438,8 +439,9 @@ pub fn bar_image(bar: &Bar, phase: Option<f64>) -> Retained<NSImage> {
.numbers
.clone()
.unwrap_or_else(|| ("—".to_string(), "—".to_string()));
// 和菜单栏上别的数字（网速、电量这些）一个样子：9pt 常规，两行一样
let font = mono(9.0, weight(Weight::Regular));
// 和菜单栏上别的数字（网速、电量这些）一样 9pt，两行一样。用中等字重：模板图被系统
// 着成约 85% 的黑，常规字重比别家画纯黑的读数显得淡
let font = mono(9.0, weight(Weight::Medium));
let (top_font, bottom_font) = (font.clone(), font);
let numbers_w = if show_numbers {
let a = attributed(&top, &top_font, &NSColor::labelColor())
Expand Down Expand Up @@ -954,6 +956,7 @@ pub fn inform(mtm: MainThreadMarker, title: &str, body: &str) {
#[derive(Clone, Copy)]
enum Weight {
Regular,
Medium,
Semibold,
}

Expand All @@ -962,6 +965,7 @@ fn weight(w: Weight) -> f64 {
unsafe {
match w {
Weight::Regular => NSFontWeightRegular,
Weight::Medium => NSFontWeightMedium,
Weight::Semibold => NSFontWeightSemibold,
}
}
Expand Down
Loading