reorder lib.rs

Author: Terkwood

src/lib.rs

@@ -11,6 +11,20 @@ use stdweb::web::Date;
 use stdweb::web::{document, CanvasRenderingContext2d};
 use yew::prelude::*;
 
+pub enum Screen {
+    Splash,
+    Video,
+    Snapshot,
+}
+
+#[derive(Clone)]
+pub struct ButtonPosition {
+    x: u32,
+    y: u32,
+    width: u32,
+    height: u32,
+}
+
 pub enum Msg {
     SwapToVideo,
     TakePicture,
@@ -19,27 +33,13 @@ pub enum Msg {
     DownloadButtonClicked,
 }
 
-pub enum Screen {
-    Splash,
-    Video,
-    Snapshot,
-}
-
 pub struct State {
     link: ComponentLink<State>,
     screen: Screen,
     snapshot_data_url: Option<String>,
     download_button_position: Option<ButtonPosition>,
 }
 
-#[derive(Clone)]
-pub struct ButtonPosition {
-    x: u32,
-    y: u32,
-    width: u32,
-    height: u32,
-}
-
 impl Component for State {
     type Message = Msg;
     type Properties = ();
@@ -82,13 +82,6 @@ impl Component for State {
                     .replace("image/jpeg", "image/octet-stream");
                 download.set_attribute("href", &img).unwrap();
 
-                js!{console.log("Download button clicked");}
-                /*
-                                var canvas = document.getElementById("mycanvas");
-                var img    = canvas.toDataURL("image/png");
-                document.write('<img src="'+img+'"/>');
-                            */
-
                 false
             }
             Msg::TakePicture => {
@@ -135,11 +128,6 @@ impl Component for State {
     }
 }
 
-fn resize_canvas(canvas: &CanvasElement) {
-    canvas.set_width(canvas.offset_width() as u32);
-    canvas.set_height(canvas.offset_height() as u32);
-}
-
 impl Renderable<State> for State {
     fn view(&self) -> Html<Self> {
         match self.screen {
@@ -168,6 +156,11 @@ impl Renderable<State> for State {
     }
 }
 
+fn resize_canvas(canvas: &CanvasElement) {
+    canvas.set_width(canvas.offset_width() as u32);
+    canvas.set_height(canvas.offset_height() as u32);
+}
+
 fn download_file_name() -> String {
     let to_secs = 1000;
     format!("vision-{}.jpg", Date::now() as u64 / to_secs as u64)