First pass on fixes
This commit is contained in:
parent
5826d89b97
commit
2f3be75fc7
269 changed files with 1593 additions and 2574 deletions
|
@ -269,8 +269,8 @@ impl Render for ApplicationMenu {
|
|||
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||||
let all_menus_shown = self.all_menus_shown(cx);
|
||||
|
||||
if let Some(pending_menu_open) = self.pending_menu_open.take() {
|
||||
if let Some(entry) = self
|
||||
if let Some(pending_menu_open) = self.pending_menu_open.take()
|
||||
&& let Some(entry) = self
|
||||
.entries
|
||||
.iter()
|
||||
.find(|entry| entry.menu.name == pending_menu_open && !entry.handle.is_deployed())
|
||||
|
@ -296,7 +296,6 @@ impl Render for ApplicationMenu {
|
|||
cx.defer_in(window, move |_, window, cx| handle_to_show.show(window, cx));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div()
|
||||
.key_context("ApplicationMenu")
|
||||
|
|
|
@ -593,12 +593,11 @@ impl TitleBar {
|
|||
Button::new("connection-status", label)
|
||||
.label_size(LabelSize::Small)
|
||||
.on_click(|_, window, cx| {
|
||||
if let Some(auto_updater) = auto_update::AutoUpdater::get(cx) {
|
||||
if auto_updater.read(cx).status().is_updated() {
|
||||
if let Some(auto_updater) = auto_update::AutoUpdater::get(cx)
|
||||
&& auto_updater.read(cx).status().is_updated() {
|
||||
workspace::reload(cx);
|
||||
return;
|
||||
}
|
||||
}
|
||||
auto_update::check(&Default::default(), window, cx);
|
||||
})
|
||||
.into_any_element(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue