Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Better "Restart to Update" button dismissals (#60448)

Kirill Bulatov48c03b2f7f2a
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index e4c837618d9..67643ee6345 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -180,6 +180,7 @@ pub struct AutoUpdater {
pending_poll: Option<Task<Option<()>>>,
quit_subscription: Option<gpui::Subscription>,
update_check_type: UpdateCheckType,
+ dismissed_status: Option<AutoUpdateStatus>,
}
#[derive(Deserialize, Serialize, Clone, Debug)]
@@ -426,6 +427,7 @@ impl AutoUpdater {
pending_poll: None,
quit_subscription,
update_check_type: UpdateCheckType::Automatic,
+ dismissed_status: None,
}
}
@@ -458,6 +460,9 @@ impl AutoUpdater {
}
pub fn poll(&mut self, check_type: UpdateCheckType, cx: &mut Context<Self>) {
+ if check_type.is_manual() {
+ self.dismissed_status = None;
+ }
if self.pending_poll.is_some() {
if self.update_check_type == UpdateCheckType::Automatic {
self.update_check_type = check_type;
@@ -511,6 +516,15 @@ impl AutoUpdater {
self.status.clone()
}
+ pub fn dismissed_status(&self) -> Option<AutoUpdateStatus> {
+ self.dismissed_status.clone()
+ }
+
+ pub fn dismiss_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
+ self.dismissed_status = Some(status);
+ cx.notify();
+ }
+
pub fn dismiss(&mut self, cx: &mut Context<Self>) -> bool {
if let AutoUpdateStatus::Idle = self.status {
return false;
diff --git a/crates/title_bar/src/update_version.rs b/crates/title_bar/src/update_version.rs
index 622572abad3..876c00b9ba6 100644
--- a/crates/title_bar/src/update_version.rs
+++ b/crates/title_bar/src/update_version.rs
@@ -9,31 +9,30 @@ use ui::{UpdateButton, prelude::*};
pub struct UpdateVersion {
status: AutoUpdateStatus,
update_check_type: UpdateCheckType,
- dismissed: bool,
+ dismissed_status: Option<AutoUpdateStatus>,
}
impl UpdateVersion {
pub fn new(cx: &mut Context<Self>) -> Self {
if let Some(auto_updater) = AutoUpdater::get(cx) {
cx.observe(&auto_updater, |this, auto_update, cx| {
- this.status = auto_update.read(cx).status();
- this.update_check_type = auto_update.read(cx).update_check_type();
- if this.status.is_updated() {
- this.dismissed = false;
- }
+ let auto_update = auto_update.read(cx);
+ this.status = auto_update.status();
+ this.update_check_type = auto_update.update_check_type();
+ this.dismissed_status = auto_update.dismissed_status();
cx.notify();
})
.detach();
Self {
status: auto_updater.read(cx).status(),
update_check_type: UpdateCheckType::Automatic,
- dismissed: false,
+ dismissed_status: auto_updater.read(cx).dismissed_status(),
}
} else {
Self {
status: AutoUpdateStatus::Idle,
update_check_type: UpdateCheckType::Automatic,
- dismissed: false,
+ dismissed_status: None,
}
}
}
@@ -59,12 +58,27 @@ impl UpdateVersion {
self.status = next_state;
self.update_check_type = UpdateCheckType::Manual;
- self.dismissed = false;
+ self.dismissed_status = None;
cx.notify()
}
pub fn show_update_in_menu_bar(&self) -> bool {
- self.dismissed && self.status.is_updated()
+ self.is_dismissed() && self.status.is_updated()
+ }
+
+ fn is_dismissed(&self) -> bool {
+ self.dismissed_status.as_ref() == Some(&self.status)
+ }
+
+ fn dismiss(&mut self, cx: &mut Context<Self>) {
+ self.dismissed_status = Some(self.status.clone());
+ if let Some(auto_updater) = AutoUpdater::get(cx) {
+ let status = self.status.clone();
+ auto_updater.update(cx, |auto_updater, cx| {
+ auto_updater.dismiss_status(status, cx)
+ });
+ }
+ cx.notify()
}
fn version_tooltip_message(version: &Version) -> String {
@@ -74,7 +88,7 @@ impl UpdateVersion {
impl Render for UpdateVersion {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
- if self.dismissed {
+ if self.is_dismissed() {
return Empty.into_any_element();
}
match &self.status {
@@ -95,10 +109,7 @@ impl Render for UpdateVersion {
.on_click(|_, _, cx| {
workspace::reload(cx);
})
- .on_dismiss(cx.listener(|this, _, _window, cx| {
- this.dismissed = true;
- cx.notify()
- }))
+ .on_dismiss(cx.listener(|this, _, _window, cx| this.dismiss(cx)))
.into_any_element()
}
AutoUpdateStatus::Errored { error } => {
@@ -107,10 +118,7 @@ impl Render for UpdateVersion {
.on_click(|_, window, cx| {
window.dispatch_action(Box::new(workspace::OpenLog), cx);
})
- .on_dismiss(cx.listener(|this, _, _window, cx| {
- this.dismissed = true;
- cx.notify()
- }))
+ .on_dismiss(cx.listener(|this, _, _window, cx| this.dismiss(cx)))
.into_any_element()
}
AutoUpdateStatus::Idle | AutoUpdateStatus::Checking { .. } => Empty.into_any_element(),