Changeset 116

Timestamp:

Dec 12, 2008, 11:39:03 PM (15 years ago)

Author:

rryu

Message:

空きメモリ領域がグラフの3分の2以上を占める場合は、3分の1以下になるように拡大するようにした。

Location:

trunk/MacFaceFloat

Files:

• ConfigurationForm.cs (modified) (3 diffs)
• StatusWindow.cs (modified) (1 diff)

trunk/MacFaceFloat/ConfigurationForm.cs

@@ -109 +109 @@
             this.lblTitle = new System.Windows.Forms.Label();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.label12 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
             this.trackBarUpdateSpeed = new System.Windows.Forms.TrackBar();
-            this.label12 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarOpacity)).BeginInit();
@@ -352 +352 @@
             this.groupBox3.Text = "XVŠÔŠu";
             // 
+            // label12
+            // 
+            this.label12.Location = new System.Drawing.Point(105, 49);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(38, 11);
+            this.label12.TabIndex = 2;
+            this.label12.Text = "0.5•b";
+            this.label12.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+            // 
             // label11
             // 
@@ -380 +389 @@
             this.trackBarUpdateSpeed.Value = 10;
             this.trackBarUpdateSpeed.ValueChanged += new System.EventHandler(this.trackBarUpdateSpeed_ValueChanged);
-            // 
-            // label12
-            // 
-            this.label12.Location = new System.Drawing.Point(129, 49);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(38, 11);
-            this.label12.TabIndex = 2;
-            this.label12.Text = "0.5•b";
-            this.label12.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
             // ConfigurationForm

trunk/MacFaceFloat/StatusWindow.cs

@@ -154 +154 @@
 
             ulong totalMemory = (ulong)memStats.TotalVisibleMemorySize * 1024;
-                        double rate = (double)fh / (totalMemory * 1.5);
+            double rate;
+
+                        MemoryUsage latestUsage = memStats.Latest;
+            if (latestUsage.Used + latestUsage.Available > totalMemory * 1.5)
+            {
+                rate = (double)fh / (totalMemory * 3.0);// (double)memStats.CommitLimit;
+            }
+            else
+            {
+                rate = (double)fh / (totalMemory * 1.5);
+            }
+
             int border = (int)(totalMemory * rate);