Changeset 54

Timestamp:

Apr 7, 2005, 11:36:37 PM (19 years ago)

Author:

altba\rryu

Message:

・Alt+F4でウインドウを閉じなくした。
・ステータスウインドウの表示位置を保存するようにした。

Location:

trunk/MacFaceFloat

Files:

• Configuration.cs (modified) (1 diff)
• MacFaceApp.cs (modified) (8 diffs)

trunk/MacFaceFloat/Configuration.cs

@@ -48 +48 @@
                 [Category("ŠçƒtƒH[ƒ€"), Description("ƒ}ƒEƒXƒƒbƒZ[ƒW‚𓧉߂³‚¹‚é‚©‚Ç‚¤‚©‚ðŽw’肵‚Ü‚·B")]
                 public bool TransparentMouseMessage;
+
+                [AutoConfigure("form.status.point")]
+                [Category("ƒXƒe[ƒ^ƒXƒEƒCƒ“ƒhƒE"), Description("•\Ž¦ˆÊ’u")]
+                public Point StatusWindowLocation;
 
                 public static Configuration GetInstance()

trunk/MacFaceFloat/MacFaceApp.cs

@@ -32 +32 @@
                 private MemoryUsageCounter memoryCounter;
 
-                private Form statusWindow;
+                private StatusWindow statusWindow;
                 private Bitmap cpuGraph;
                 private Bitmap memoryGraph;
@@ -107 +107 @@
                         // ƒpƒ^[ƒ“ƒEƒCƒ“ƒhƒE
                         this.patternWindow = new PatternWindow();
+                        this.patternWindow.Closing += new System.ComponentModel.CancelEventHandler(patternWindow_Closing);
 
                         // ƒXƒe[ƒ^ƒXƒEƒCƒ“ƒhƒE
                         cpuGraph = new Bitmap(5*60, 100);
                         memoryGraph = new Bitmap(5*60, 100);
-
-                        statusWindow = new Form();
-                        statusWindow.ClientSize = new System.Drawing.Size(310, 215);
-                        statusWindow.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-                        statusWindow.ControlBox = false;
-                        statusWindow.MaximizeBox = false;
-                        statusWindow.MinimizeBox = false;
-                        statusWindow.Icon = new Icon(asm.GetManifestResourceStream("MacFace.FloatApp.App.ico"));
-                        statusWindow.Text = "ƒXƒe[ƒ^ƒX";
-                        statusWindow.Paint +=new PaintEventHandler(statusWindow_Paint);
+                        statusWindow = new StatusWindow();
+                        patternWindow.Closing += new System.ComponentModel.CancelEventHandler(patternWindow_Closing);
+                        statusWindow.cpuGraphPicBox.Image = cpuGraph;
+                        statusWindow.memoryGraphPicBox.Image = memoryGraph;
                 }
 
@@ -143 +138 @@
                         drawCPUGraph();
                         drawMemoryGraph();
+                        statusWindow.Location = config.StatusWindowLocation;
                         statusWindow.Show();
 
@@ -164 +160 @@
                         // •Û‘¶
                         config.Location = patternWindow.Location;
+                        config.StatusWindowLocation = statusWindow.Location;
                         config.Save();
                 }
@@ -281 +278 @@
                         drawCPUGraph();
                         drawMemoryGraph();
-                        statusWindow.Invalidate();
+                        statusWindow.cpuGraphPicBox.Invalidate();
+                        statusWindow.memoryGraphPicBox.Invalidate();
                 }
 
@@ -402 +400 @@
                         Brush commitedBrush = new SolidBrush(Color.FromArgb(180, 255, 145, 0));
                         Brush uncommitedBrush = new SolidBrush(Color.FromArgb(180, 180, 200, 255));
-                        Brush availableBrush = new SolidBrush(Color.FromArgb(100, 100, 100, 255));
+                        Brush availableBrush = new SolidBrush(Color.FromArgb(180, 100, 100, 255));
                         Brush spaceBrush = new SolidBrush(Color.FromArgb(180, 240, 230, 255));
 
@@ -416 +414 @@
                                 w = 5;
 
-                                h = 100 - border;
+                                h = (int)(usage.Available * rate);
+                                y = 100 - h;
+                                g.FillRectangle(availableBrush, x, y, w, h);
+
+                                h = (int)(usage.Committed * rate);
+                                y -= h;
+                                g.FillRectangle(commitedBrush, x, y, w, h);
+
+                                if (y > 100 - border) 
+                                {
+                                        h = y - (100 - border);
+                                        y = 100 - border;
+                                        g.FillRectangle(uncommitedBrush, x, y, w, h);
+                                }
+
+                                h = y;
                                 y = 0;
                                 g.FillRectangle(spaceBrush, x, y, w, h);
-
-                                h = (int)(usage.Committed * rate);
-                                y = 100 - h;
-                                g.FillRectangle(commitedBrush, x, y, w, h);
-
-                                if (h < border) 
-                                {
-                                        h = border - h;
-                                        y = 100 - border;
-                                        g.FillRectangle(uncommitedBrush, x, y, w, h);
-                                }
-
-                                h = (int)(usage.Available * rate);
-                                y = 100 - border;
-                                g.FillRectangle(availableBrush, x, y, w, h);
 
                                 x = 300 - i * 5 - 5;
@@ -455 +453 @@
                         g.Dispose();
                 }
+
+                private void patternWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+                {
+                        e.Cancel = true;
+                }
         }
 }