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

Merge pull request #1828 from zed-industries/following-scrollbar

Browse source 
Show scrollbar when scrolling while following
This commit is contained in:
Max Brunsfeld 2022-10-27 12:46:14 -07:00
parent e5959483ed
commit 6e2d3aae68
4 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/client/src/amplitude_telemetry.rs
View file

@ -97,15 +97,9 @@ impl AmplitudeTelemetry {
.unwrap() .unwrap()
.as_millis(), .as_millis(),
state: Mutex::new(AmplitudeTelemetryState { state: Mutex::new(AmplitudeTelemetryState {
os_version: platform os_version: platform.os_version().ok().map(|v| v.to_string().into()),
.os_version()
.log_err()
.map(|v| v.to_string().into()),
os_name: platform.os_name().into(), os_name: platform.os_name().into(),
app_version: platform app_version: platform.app_version().ok().map(|v| v.to_string().into()),
.app_version()
.log_err()
.map(|v| v.to_string().into()),
device_id: None, device_id: None,
queue: Default::default(), queue: Default::default(),
flush_task: Default::default(), flush_task: Default::default(),

10
crates/client/src/telemetry.rs
View file

@ -103,15 +103,9 @@ impl Telemetry {
http_client: client, http_client: client,
executor: cx.background().clone(), executor: cx.background().clone(),
state: Mutex::new(TelemetryState { state: Mutex::new(TelemetryState {
os_version: platform os_version: platform.os_version().ok().map(|v| v.to_string().into()),
.os_version()
.log_err()
.map(|v| v.to_string().into()),
os_name: platform.os_name().into(), os_name: platform.os_name().into(),
app_version: platform app_version: platform.app_version().ok().map(|v| v.to_string().into()),
.app_version()
.log_err()
.map(|v| v.to_string().into()),
device_id: None, device_id: None,
metrics_id: None, metrics_id: None,
queue: Default::default(), queue: Default::default(),

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

@ -71,7 +71,6 @@ 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;

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

@ -1353,6 +1353,7 @@ impl Editor {
) { ) {
self.scroll_top_anchor = anchor; self.scroll_top_anchor = anchor;
self.scroll_position = position; self.scroll_position = position;
self.make_scrollbar_visible(cx);
cx.emit(Event::ScrollPositionChanged { local: false }); cx.emit(Event::ScrollPositionChanged { local: false });
cx.notify(); cx.notify();
} }