Merge pull request #541 from JasonLautzenheiser/revert-536-Update_to_…

…dotnet6 Revert "update project to .net 6"
JasonLautzenheiser · Feb 12, 2022 · 9857a61 · 9857a61
2 parents fc9acc6 + b0308ca
commit 9857a61
Show file tree

Hide file tree

Showing 7 changed files with 374 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@ TestResults
 *.suo
 *.user
 *.sln.docstates
-*.idea
 
 # Build results
 [Dd]ebug/
@@ -114,5 +113,3 @@ UpgradeLog*.XML
 /*.DotSettings
 /.vs/Trizbort/v15/sqlite3/storage.ide
 .vs
-.upgrade-assistant
-/upgrade-assistant.clef
diff --git a/Domain/StatusBar/ZoomStatusWidget.cs b/Domain/StatusBar/ZoomStatusWidget.cs
@@ -7,7 +7,7 @@
 
 namespace Trizbort.Domain.StatusBar {
   public class ZoomStatusWidget : IStatusWidget {
-    // ContextMenu menu;
+    ContextMenu menu;
 
     public StatusItems Id => StatusItems.tsb_CapsLock;
     public string Name => "Zoom";
@@ -21,20 +21,20 @@ public string DisplayText() {
     }
 
     public void ClickHandler() {
-      // menu.Show(Project.Current.Canvas, Cursor.Position);
+      menu.Show(Project.Current.Canvas, Cursor.Position);
     }
 
     public ZoomStatusWidget() {
-      // menu = new ContextMenu();
-      // menu.MenuItems.Add("Zoom 300%", (o, args) => setZoom(o, 3.00f));
-      // menu.MenuItems.Add("Zoom 250%", (o, args) => setZoom(o, 2.50f));
-      // menu.MenuItems.Add("Zoom 200%", (o, args) => setZoom(o, 2.00f));
-      // menu.MenuItems.Add("Zoom 175%", (o, args) => setZoom(o, 1.75f));
-      // menu.MenuItems.Add("Zoom 150%", (o, args) => setZoom(o, 1.50f));
-      // menu.MenuItems.Add("Zoom 125%", (o, args) => setZoom(o, 1.25f));
-      // menu.MenuItems.Add("Zoom 100%", (o, args) => setZoom(o, 1.00f));
-      // menu.MenuItems.Add("Zoom 75%", (o, args) => setZoom(o, 0.75f));
-      // menu.MenuItems.Add("Zoom 50%", (o, args) => setZoom(o, 0.50f));
+      menu = new ContextMenu();
+      menu.MenuItems.Add("Zoom 300%", (o, args) => setZoom(o, 3.00f));
+      menu.MenuItems.Add("Zoom 250%", (o, args) => setZoom(o, 2.50f));
+      menu.MenuItems.Add("Zoom 200%", (o, args) => setZoom(o, 2.00f));
+      menu.MenuItems.Add("Zoom 175%", (o, args) => setZoom(o, 1.75f));
+      menu.MenuItems.Add("Zoom 150%", (o, args) => setZoom(o, 1.50f));
+      menu.MenuItems.Add("Zoom 125%", (o, args) => setZoom(o, 1.25f));
+      menu.MenuItems.Add("Zoom 100%", (o, args) => setZoom(o, 1.00f));
+      menu.MenuItems.Add("Zoom 75%", (o, args) => setZoom(o, 0.75f));
+      menu.MenuItems.Add("Zoom 50%", (o, args) => setZoom(o, 0.50f));
     }
 
     private void setZoom(object sender, float zoomFactor) {

diff --git a/Program.cs b/Program.cs
@@ -1,4 +1,4 @@
-/*
+/*
     Copyright (c) 2010-2018 by Genstein and Jason Lautzenheiser.
 
     This file is (or was originally) part of Trizbort, the Interactive Fiction Mapper.
@@ -41,7 +41,6 @@ internal static class Program
     private static void Main(string[] args)
     {
       System.Windows.Forms.Application.EnableVisualStyles();
-      Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
       System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
 
       Console.WriteLine(AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName);
@@ -54,4 +53,4 @@ private static void Main(string[] args)
       }
     }
   }
-}
+}