From 30789bd6929360f0a6fcdb2a45eff55476040e97 Mon Sep 17 00:00:00 2001
From: Stijn Seghers <stijnseghers@gmail.com>
Date: Tue, 2 May 2023 11:02:15 +0200
Subject: [PATCH] Fixups for PR comments

---
 app/gui/src/presenter/project.rs |  6 ++----
 app/gui/view/src/project.rs      | 15 ++++++---------
 lib/rust/web/src/binding/mock.rs |  2 ++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/gui/src/presenter/project.rs b/app/gui/src/presenter/project.rs
index 5f25a2325694..e5b892a0036b 100644
--- a/app/gui/src/presenter/project.rs
+++ b/app/gui/src/presenter/project.rs
@@ -318,11 +318,9 @@ impl Model {
     }
 
     fn close_ide(&self) {
-        let Some(window) = web_sys::window() else { return error!("Failed to get JS Window.") };
-        let Some(document) = window.document() else { return error!("Failed to get JS Document.") };
-        match web_sys::Event::new("ide-close") {
+        match enso_web::Event::new("ide-close") {
             Ok(event) =>
-                if let Err(error) = document.dispatch_event(&event) {
+                if let Err(error) = enso_web::document.dispatch_event(&event) {
                     error!("Failed to dispatch event to close IDE. {error:?}");
                 },
             Err(error) => error!("Failed to create event to close IDE. {error:?}"),
diff --git a/app/gui/view/src/project.rs b/app/gui/view/src/project.rs
index cd4b0f1aec7a..e67605423c5c 100644
--- a/app/gui/view/src/project.rs
+++ b/app/gui/view/src/project.rs
@@ -281,14 +281,11 @@ impl Model {
             window_control_buttons.set_xy(top_left);
         }
         let gap = crate::graph_editor::TOP_BAR_ITEM_MARGIN;
-        let dashboard_button_offset_x = window_control_buttons_width + gap;
-        let dashboard_button_pos = top_left
-            + Vector2(
-                dashboard_button_offset_x + dashboard_button_width / 2.0,
-                -TOP_BAR_HEIGHT / 2.0,
-            );
+        let dashboard_button_offset = Vector2(window_control_buttons_width + gap, 0.0);
+        let dashboard_button_origin = Vector2(dashboard_button_width, -TOP_BAR_HEIGHT) / 2.0;
+        let dashboard_button_pos = top_left + dashboard_button_offset + dashboard_button_origin;
         self.dashboard_button.set_xy(dashboard_button_pos);
-        let top_bar_width = dashboard_button_offset_x + dashboard_button_width;
+        let top_bar_width = dashboard_button_offset.x + dashboard_button_width;
         top_bar_width
     }
 
@@ -403,7 +400,7 @@ impl View {
         let searcher_open_delay = frp::io::timer::Timeout::new(network);
 
         frp::extend! { network
-            init <- source::<()>();
+            init <- source_();
         }
 
 
@@ -439,7 +436,7 @@ impl View {
                 dashboard_button_width
             );
             top_bar_width <- top_bar_update.map(
-                f!([model] ((_, scene_shape, window_control_buttons_width, dashboard_button_width))
+                f!(((_, scene_shape, window_control_buttons_width, dashboard_button_width))
                     model.relayout_top_bar(
                         scene_shape,
                         *window_control_buttons_width,
diff --git a/lib/rust/web/src/binding/mock.rs b/lib/rust/web/src/binding/mock.rs
index 0277bc6db538..52b7824a5ba0 100644
--- a/lib/rust/web/src/binding/mock.rs
+++ b/lib/rust/web/src/binding/mock.rs
@@ -532,6 +532,7 @@ mock_data! { Document => EventTarget
     fn create_element(&self, local_name: &str) -> Result<Element, JsValue>;
     fn get_element_by_id(&self, element_id: &str) -> Option<Element>;
     fn create_text_node(&self, data: &str) -> Text;
+    fn dispatch_event(&self, event: &Event) -> Result<bool, JsValue>;
 }
 
 
@@ -574,6 +575,7 @@ impl AddEventListenerOptions {
 
 // === Event ===
 mock_data! { Event => Object
+    fn new(type_: &str) -> Result<Event, JsValue>;
     fn prevent_default(&self);
     fn stop_propagation(&self);
     fn current_target(&self) -> Option<EventTarget>;