Changeset 34

Timestamp:

Feb 23, 2005, 5:37:18 PM (19 years ago)

Author:

altba\rryu

Message:

アプリケーションクラス作成に向けてのコード整理。

File:

• trunk/MacFaceFloat/MainForm.cs (modified) (11 diffs)

trunk/MacFaceFloat/MainForm.cs

@@ -26 +26 @@
                 private System.Windows.Forms.MenuItem menuItemConfigure;
                 private System.Windows.Forms.MenuItem menuItemExit;
-                private String _facePath;
+
+                private Configuration _config;
+
                 private System.Windows.Forms.Timer _updateTimer;
-
-                private FaceDef _currentFaceDef;
-                private Configuration _config;
-                private float _patternSize;
-
-                private int prevPattern;
-                private FaceDef.PatternSuite prevSuite;
-                private int prevMarkers;
-
                 private CPUUsageCounter cpuCounter;
                 private MemoryUsageCounter memoryCounter;
+
+                private FaceDef _currentFaceDef;
+                private float _patternSize;
+                private FaceDef.PatternSuite curSuite;
+                private int curPattern;
+                private int curMarkers;
 
                 // ƒRƒ“ƒXƒgƒ‰ƒNƒ^
@@ -47 +46 @@
                         this.MoveAtFormDrag = true;
 
-                        prevPattern = -1;
-                        prevSuite   = FaceDef.PatternSuite.Normal;
-                        prevMarkers = -1;
+                        curSuite   = FaceDef.PatternSuite.Normal;
+                        curPattern = 0;
+                        curMarkers = 0;
 
                         cpuCounter = new CPUUsageCounter();
@@ -58 +57 @@
                         _updateTimer.Interval = 1000;
                         _updateTimer.Tick += new EventHandler(this.CountProcessorUsage);
+                        _updateTimer.Stop();
                 }
 
@@ -114 +114 @@
                         this.Load += new EventHandler(MainForm_Load);
                         this.Closing += new CancelEventHandler(MainForm_Closing);
-                        this.Move += new EventHandler(MainForm_Move);
                 }
                         
@@ -193 +192 @@
                         if (_updateTimer != null) _updateTimer.Stop();
 
-                        _currentFaceDef = newFaceDef;
-                        _facePath = _currentFaceDef.Path;
+                        this.FaceDef = newFaceDef;
+                        RefreshPattern();
+
                         notifyIcon.Text = "MacFace - " + _currentFaceDef.Title;
-                        prevPattern = -1;
-                        prevMarkers = -1;
 
                         // XVÄŠJ
@@ -226 +224 @@
                         if (memUsage.Pageout > 0) markers += FaceDef.MarkerPageOut;
 
-                        if (prevPattern != pattern || prevSuite != suite || prevMarkers != markers) 
-                        {
-                                Graphics g = this.Graphics;
-                                g.Clear(Color.FromArgb(0, 0, 0, 0));
-                                _currentFaceDef.DrawPatternImage(g, suite, pattern, markers, _patternSize);
-                                this.Update();
-                        }
-                                
-                        prevPattern = pattern;
-                        prevSuite   = suite;
-                        prevMarkers = markers;
+                        UpdatePattern(suite, pattern, markers);
                 }
 
@@ -243 +231 @@
                         get { return _patternSize; }
                         set { _patternSize = value; }
+                }
+
+                public FaceDef FaceDef
+                {
+                        get { return _currentFaceDef; }
+                        set { _currentFaceDef = value; }
+                }
+
+                public void UpdatePattern(FaceDef.PatternSuite suite, int patternNo, int markers)
+                {
+                        if (curSuite != suite || curPattern != patternNo || curMarkers != markers) 
+                        {
+                                curSuite   = suite;
+                                curPattern = patternNo;
+                                curMarkers = markers;
+                                RefreshPattern();
+                        }
+                }
+
+                public void RefreshPattern()
+                {
+                        Graphics g = this.Graphics;
+                        g.Clear(Color.FromArgb(0, 0, 0, 0));
+                        _currentFaceDef.DrawPatternImage(g, curSuite, curPattern, curMarkers, _patternSize);
+                        this.Update();
                 }
 
@@ -254 +267 @@
                         _config.Load();
 
-                        ApplyConfiguration();
 
                         // Šçƒpƒ^[ƒ““ǂݍž‚Ý
@@ -261 +273 @@
                         {
                                 result = LoadFaceDefine(_config.FaceDefPath);
+                                ApplyConfiguration();
+                                _updateTimer.Start();
                         }
 
@@ -297 +311 @@
                 public void menuItemPatternSelect_Click(object sender, System.EventArgs e)
                 {
-                        SelectFaceDefine(_facePath);    
+                        SelectFaceDefine(FaceDef.Path); 
                 }
 
@@ -322 +336 @@
                         this.TransparentMouseMessage = _config.TransparentMouseMessage;
 
-                        // Ý’è•ÏXŒã‚͏í‚É•\Ž¦‚ðXV‚·‚é‚悤‚É‚·‚é
-                        prevPattern = -1;
-                        prevMarkers = -1;
-                }
-
-                private void MainForm_Move(object sender, EventArgs e)
-                {
-                        _config.Location = this.Location;
+                        RefreshPattern();
                 }
         }