デバッグ時に強制終了できるように、ウィンドウサイズの調整

Misaki0331 · Nov 13, 2023 · a92bb14 · a92bb14
1 parent 7ab2296
commit a92bb14
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/WindowManiaPlayer2/Form1.cs b/WindowManiaPlayer2/Form1.cs
@@ -246,6 +246,7 @@ private void playerplay_Click(object sender, EventArgs e)
             bool isdebug = IsDebugMode.Checked;
             if (isdebug)
             {
+                dw.WantClose = false;
                 dw.Show();
                 dw.Location = new Point(10, 10);
             }
@@ -270,7 +271,6 @@ private void playerplay_Click(object sender, EventArgs e)
             double bpm = 0;
             while (timer.ElapsedMilliseconds - 3000 < endtime || notewindow.Find(a => a.NoteNumber != -1) != null)
             {
-
                 if(isdebug)tmplp[timer.ElapsedMilliseconds / 20 % 50]++;
                 int now = (int)timer.ElapsedMilliseconds - 3000;
                 if (!started && now > numericUpDown1.Value)
@@ -313,6 +313,7 @@ private void playerplay_Click(object sender, EventArgs e)
                                         empty.Opacity = 1;
                                         if (notesObjects[notecount].LongScrollTime != 0)
                                             empty.ClientSize = new(150, (int)((double)notesObjects[notecount].LongScrollTime * 2 + shortsize));
+                                        else empty.ClientSize = new(150, shortsize);
                                         if (isEmpty) notewindow.Add(empty);
                                     }
 
@@ -425,6 +426,11 @@ private void playerplay_Click(object sender, EventArgs e)
                     notewindow.Remove(empty);
                     cnt++;
                     if (cnt >= 3) break;
+                    }
+                if (dw.WantClose)
+                {
+                    StopSound();
+                    break;
                 }
             }
             foreach(var win in notewindow)

diff --git a/WindowManiaPlayer2/Properties/PublishProfiles/FolderProfile.pubxml.user b/WindowManiaPlayer2/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2023-11-12T21:48:16.8898891Z;</History>
+    <History>True|2023-11-13T10:47:47.7441761Z;True|2023-11-13T06:48:16.8898891+09:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/WindowManiaPlayer2/debug.cs b/WindowManiaPlayer2/debug.cs
@@ -16,10 +16,11 @@ public DebugWindow()
         {
             InitializeComponent();
         }
-
+        public bool WantClose = false;
         private void debug_FormClosing(object sender, FormClosingEventArgs e)
         {
             e.Cancel = true;
+            WantClose = true;
         }
     }
 }
diff --git a/WindowManiaPlayer2/notes.Designer.cs b/WindowManiaPlayer2/notes.Designer.cs
diff --git a/WindowManiaPlayer2/notes.cs b/WindowManiaPlayer2/notes.cs
@@ -17,6 +17,8 @@ public partial class Notes : Form
         public Notes()
         {
             InitializeComponent();
+
+           // ClientSize = new(150, 1);
             Hide();
         }
         public int NoteNumber=-1;