Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix typo in blink manager disable which didn't properly disable, and start editors with the blink manager disabled

Browse source
This commit is contained in:
K Simmons 2022-10-26 17:39:17 -07:00
parent fcfc4a4298
commit 41699224ff
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/editor/src/blink_manager.rs
View file

@ -30,7 +30,7 @@ impl BlinkManager {
blink_epoch: 0, blink_epoch: 0,
blinking_paused: false, blinking_paused: false,
visible: true, visible: true,
enabled: true, enabled: false,
} }
} }
@ -71,6 +71,7 @@ impl BlinkManager {
if epoch == self.blink_epoch && self.enabled && !self.blinking_paused { if epoch == self.blink_epoch && self.enabled && !self.blinking_paused {
self.visible = !self.visible; self.visible = !self.visible;
cx.notify(); cx.notify();
dbg!(cx.handle());
let epoch = self.next_blink_epoch(); let epoch = self.next_blink_epoch();
let interval = self.blink_interval; let interval = self.blink_interval;
@ -96,8 +97,8 @@ impl BlinkManager {
self.blink_cursors(self.blink_epoch, cx); self.blink_cursors(self.blink_epoch, cx);
} }
pub fn disable(&mut self, _: &mut ModelContext<Self>) { pub fn disable(&mut self, cx: &mut ModelContext<Self>) {
self.enabled = true; self.enabled = false;
} }
pub fn visible(&self) -> bool { pub fn visible(&self) -> bool {

4
crates/editor/src/editor.rs
View file

@ -6511,8 +6511,10 @@ impl View for Editor {
if let Some(rename) = self.pending_rename.as_ref() { if let Some(rename) = self.pending_rename.as_ref() {
cx.focus(&rename.editor); cx.focus(&rename.editor);
} else { } else {
if !self.focused {
self.blink_manager.update(cx, BlinkManager::enable);
}
self.focused = true; self.focused = true;
self.blink_manager.update(cx, BlinkManager::enable);
self.buffer.update(cx, |buffer, cx| { self.buffer.update(cx, |buffer, cx| {
buffer.finalize_last_transaction(cx); buffer.finalize_last_transaction(cx);
if self.leader_replica_id.is_none() { if self.leader_replica_id.is_none() {