From cc66ee9d0e1f61c03d3dd8bc0478c03766217ba0 Mon Sep 17 00:00:00 2001
From: nikita_ve <nikita_ve@holdingbp.ru>
Date: Sun, 19 Jan 2025 19:35:29 +0300
Subject: [PATCH] refactor: updated .Net version, removed unused vars, cleanup
 of code

---
 FractalTreeGtk/CairoWindow.cs        |  4 ++--
 FractalTreeGtk/Draw/Fractal.cs       | 10 ++++------
 FractalTreeGtk/FractalTreeGtk.csproj |  2 +-
 FractalTreeGtk/Program.cs            | 18 +++++++-----------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/FractalTreeGtk/CairoWindow.cs b/FractalTreeGtk/CairoWindow.cs
index 50478a3..056dd72 100644
--- a/FractalTreeGtk/CairoWindow.cs
+++ b/FractalTreeGtk/CairoWindow.cs
@@ -10,7 +10,7 @@ namespace FractalTreeGtk
     internal class CairoWindow : Window
     {
         private int FractalLevels { get; set; } = 2;
-        readonly DrawingArea _drawing = new DrawingArea();
+        readonly DrawingArea _drawing = new();
         Fractal _fractal = null!;
 
         public CairoWindow(string title) : base(title)
@@ -44,9 +44,9 @@ namespace FractalTreeGtk
                         FractalLevels--;
                         GenerateFractal();
                     }
-
                     break;
                 case Key.r: //Regenerate fractal
+                case Key.R:    
                     GenerateFractal();
                     break;
             }
diff --git a/FractalTreeGtk/Draw/Fractal.cs b/FractalTreeGtk/Draw/Fractal.cs
index a0f003f..9ae9fba 100644
--- a/FractalTreeGtk/Draw/Fractal.cs
+++ b/FractalTreeGtk/Draw/Fractal.cs
@@ -6,11 +6,10 @@ namespace FractalTreeGtk.Draw
     {
         private readonly CairoWindow _window;
         private double Length { get; set; } = new Random().Next(70, 90);
-        private int MaxLevels { get; set; }
-        private int CurrentLevel { get; set; } = 0;
-        public bool IsDrawing { private set; get; }
+        private int MaxLevels { get; }
+        private int CurrentLevel { get; set; }
         private double Degree => new Random().Next(30, 50) / 100f;
-        private double DeltaLength => new Random().Next(0, 50) / 100f;
+        private double DeltaLength => new Random().Next(0, 20) / (float)Math.Log2(CurrentLevel+1);
 
         public Branch[][] FractalLines { get; }
 
@@ -38,7 +37,7 @@ namespace FractalTreeGtk.Draw
         {
             _window.QueueDraw();
             var len = DeltaLength;
-            if (Length < DeltaLength)
+            if (Length < 0)
                 Length = DeltaLength;
             else
                 Length -= DeltaLength;
@@ -94,7 +93,6 @@ namespace FractalTreeGtk.Draw
             {
                 NextLevel();
             }
-            else IsDrawing = false;
         }
     }
 }
\ No newline at end of file
diff --git a/FractalTreeGtk/FractalTreeGtk.csproj b/FractalTreeGtk/FractalTreeGtk.csproj
index 0540961..220db9a 100644
--- a/FractalTreeGtk/FractalTreeGtk.csproj
+++ b/FractalTreeGtk/FractalTreeGtk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/FractalTreeGtk/Program.cs b/FractalTreeGtk/Program.cs
index 7c2858c..4e8d085 100644
--- a/FractalTreeGtk/Program.cs
+++ b/FractalTreeGtk/Program.cs
@@ -1,18 +1,14 @@
 using Gtk;
 
-namespace FractalTreeGtk
+namespace FractalTreeGtk;
+
+internal class Program
 {
-    internal class Program
+    static void Main()
     {
-        static void Main(string[] args)
-        {
-            Application.Init();
+        Application.Init();
 
-            //Create the Window
-
-            Window myWin = new CairoWindow("My first GTK# Application! ");
-
-            Application.Run();
-        }
+        _ = new CairoWindow("Fractal window");
+        Application.Run();
     }
 }
\ No newline at end of file