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

Max Brunsfeld created 3 years ago

Show scrollbar when scrolling while following

Change summary

crates/client/src/amplitude_telemetry.rs | 10 ++--------
crates/client/src/telemetry.rs           | 10 ++--------
crates/editor/src/blink_manager.rs       |  1 -
crates/editor/src/editor.rs              |  1 +
4 files changed, 5 insertions(+), 17 deletions(-)

Detailed changes

crates/client/src/amplitude_telemetry.rs

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

crates/client/src/telemetry.rs

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

crates/editor/src/blink_manager.rs

@@ -71,7 +71,6 @@ impl BlinkManager {
             if epoch == self.blink_epoch && self.enabled && !self.blinking_paused {
                 self.visible = !self.visible;
                 cx.notify();
-                dbg!(cx.handle());
 
                 let epoch = self.next_blink_epoch();
                 let interval = self.blink_interval;

crates/editor/src/editor.rs

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