Skip to content

perf(macOS): avoid unnecessary cloing when applying tray icons, tittles, and tooltips #327

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

Open
Tunglies wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −8
Open

perf(macOS): avoid unnecessary cloing when applying tray icons, tittles, and tooltips #327

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
5 changes: 5 additions & 0 deletions .changes/perf-macos-avoid-allocating.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tray-icon": patch
---

Avoid unnecessary cloning when applying tray icons, titles, and tooltips on macOS.
16 changes: 8 additions & 8 deletions src/platform_impl/macos/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl TrayIcon {

set_icon_for_ns_status_item_button(
&ns_status_item,
attrs.icon.clone(),
attrs.icon.as_ref(),
attrs.icon_is_template,
mtm,
)?;
Expand All @@ -68,8 +68,8 @@ impl TrayIcon {
}
}

Self::set_tooltip_inner(&ns_status_item, attrs.tooltip.clone(), mtm)?;
Self::set_title_inner(&ns_status_item, attrs.title.clone(), mtm);
Self::set_tooltip_inner(&ns_status_item, attrs.tooltip.as_deref(), mtm)?;
Self::set_title_inner(&ns_status_item, attrs.title.as_deref(), mtm);

let tray_target = unsafe {
let button = ns_status_item.button(mtm).unwrap();
Expand Down Expand Up @@ -115,7 +115,7 @@ impl TrayIcon {
pub fn set_icon(&mut self, icon: Option<Icon>) -> crate::Result<()> {
if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
{
set_icon_for_ns_status_item_button(ns_status_item, icon.clone(), false, self.mtm)?;
set_icon_for_ns_status_item_button(ns_status_item, icon.as_ref(), false, self.mtm)?;
tray_target.update_dimensions();
}
self.attrs.icon = icon;
Expand Down Expand Up @@ -145,7 +145,7 @@ impl TrayIcon {
let tooltip = tooltip.map(|s| s.as_ref().to_string());
if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
{
Self::set_tooltip_inner(ns_status_item, tooltip.clone(), self.mtm)?;
Self::set_tooltip_inner(ns_status_item, tooltip.as_deref(), self.mtm)?;
tray_target.update_dimensions();
}
self.attrs.tooltip = tooltip;
Expand All @@ -170,7 +170,7 @@ impl TrayIcon {
let title = title.map(|s| s.as_ref().to_string());
if let (Some(ns_status_item), Some(tray_target)) = (&self.ns_status_item, &self.tray_target)
{
Self::set_title_inner(ns_status_item, title.clone(), self.mtm);
Self::set_title_inner(ns_status_item, title.as_deref(), self.mtm);
tray_target.update_dimensions();
}
self.attrs.title = title;
Expand Down Expand Up @@ -226,7 +226,7 @@ impl TrayIcon {
{
set_icon_for_ns_status_item_button(
ns_status_item,
icon.clone(),
icon.as_ref(),
is_template,
self.mtm,
)?;
Expand Down Expand Up @@ -282,7 +282,7 @@ impl Drop for TrayIcon {

fn set_icon_for_ns_status_item_button(
ns_status_item: &NSStatusItem,
icon: Option<Icon>,
icon: Option<&Icon>,
icon_is_template: bool,
mtm: MainThreadMarker,
) -> crate::Result<()> {
Expand Down
Loading