Added a program icon. Changed the window title to Mandelbrot by Jort …

…+ the version. Release of v1.5
jortrr · Sep 20, 2023 · 5d8b35d · 5d8b35d
1 parent 00a7bb7
commit 5d8b35d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/icons/rust.ico b/icons/rust.ico
diff --git a/src/lib.rs b/src/lib.rs
@@ -51,6 +51,12 @@ static COLORING_FUNCTION: ColoringFunction = TrueColor::new_from_bernstein_polyn
 //Color channel mapping
 static COLOR_CHANNEL_MAPPING: ColorChannelMapping = ColorChannelMapping::RGB;
 
+//Window title
+static WINDOW_TITLE: &str = "Mandelbrot by Jort";
+
+//Banner values
+static VERSION: &str = "1.5";
+
 //Views
 static VIEW_1: View = View::new(-0.6604166666666667, 0.4437500000000001, 0.1);
 static VIEW_2: View = View::new(-1.0591666666666668, 0.2629166666666668, 0.01);
@@ -63,9 +69,6 @@ static VIEW_8: View = View::new(-1.7862581627050718, 0.00005198056959995248, 0.0
 static VIEW_9: View = View::new(-0.4687339999999999, 0.5425518958333333, 0.000010000000000000003);
 static VIEW_0: View = View::new(-0.437520465811966, 0.5632133750000006, 0.000004000000000000004);
 
-//Banner values
-static VERSION: &str = "1.4";
-
 ///Holds all the logic currently in the main function that isn't involved with setting up configuration or handling errors, to make `main` concise and
 ///easy to verify by inspection
 /// # Panics

diff --git a/src/view/minifb_mandelbrot_view.rs b/src/view/minifb_mandelbrot_view.rs
@@ -1,6 +1,8 @@
-use minifb::{Key, Window, WindowOptions};
+use std::str::FromStr;
 
-use crate::model::mandelbrot_model::MandelbrotModel;
+use minifb::{Icon, Key, Window, WindowOptions};
+
+use crate::{model::mandelbrot_model::MandelbrotModel, VERSION, WINDOW_TITLE};
 
 pub struct MandelbrotView {
     pub window: Window,
@@ -9,15 +11,29 @@ pub struct MandelbrotView {
 impl MandelbrotView {
     pub fn new(mandelbrot_model: &MandelbrotModel) -> MandelbrotView {
         // Create a new window
-        let window = Window::new(
-            "Mandelbrot set viewer",
+        let mut window = Window::new(
+            &format!("{} v{}", WINDOW_TITLE, VERSION),
             mandelbrot_model.config.window_width,
             mandelbrot_model.config.window_height,
-            WindowOptions::default(),
+            WindowOptions {
+                borderless: false,
+                title: true,
+                resize: true,
+                scale: minifb::Scale::X1,
+                scale_mode: minifb::ScaleMode::Center,
+                topmost: false,
+                transparency: false,
+                none: false,
+            },
         )
         .unwrap_or_else(|e| {
             panic!("{}", e);
         });
+        //Set window background color to darkgray
+        window.set_background_color(27, 27, 27);
+
+        #[cfg(target_os = "windows")]
+        window.set_icon(Icon::from_str("icons/rust.ico").unwrap());
 
         //Print info about the MandelbrotModel
         mandelbrot_model.p.pixel_plane.print();