clean up

ScrenSaverEf/MainForm.Designer.cs

@@ -29,14 +29,14 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.UpdateTimer = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
-            // timer1
+            // UpdateTimer
             // 
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            this.UpdateTimer.Tick += new System.EventHandler(this.timer1_Tick);
             // 
-            // Form1
+            // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -44,24 +44,24 @@
             this.ClientSize = new System.Drawing.Size(862, 502);
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "Form1";
+            this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Text = "GDI Example";
             this.Load += new System.EventHandler(this.Form1_Load);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Form1_Paint);
-            this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.Form1_MouseClick);
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
             this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.Form1_KeyPress);
             this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp);
-            this.Resize += new System.EventHandler(this.Form1_Resize);
+            this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.Form1_MouseClick);
             this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.Form1_PreviewKeyDown);
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown);
+            this.Resize += new System.EventHandler(this.Form1_Resize);
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.Timer UpdateTimer;
     }
 }
 

ScrenSaverEf/MainForm.cs

@@ -13,13 +13,12 @@ namespace ScreenSaverEf
         PointF _posSky;
         PointF _posDn;
 
-        PointF _posShyr;
-        PointF _posDnr;
+        PointF _posSkyReset;
+        PointF _posDnReset;
 
         PointF _posC = PointF.Empty;
         PointF _posCr;
-
-        Rectangle _blkUp;
+        
         Rectangle _blkDn;
 
         #region POSC_DATA
@@ -81,14 +80,14 @@ namespace ScreenSaverEf
 
 
             ResetPos();
-            timer1.Start();
+            UpdateTimer.Start();
         }
 
         private void ResetPos()
         {
-            _posShyr = _posSky = new PointF(-_imgSky.Width + Width, (Height - 600) / 2);
-            _posDnr = _posDn = new PointF(-_imgDn.Width + Width, (Height - 600) / 2);
-            _posCr = new PointF(Width - _imgC.Width, (Height - 600) / 2);
+            _posSkyReset = _posSky = new PointF(-_imgSky.Width + Width, (Height - 600) / 2f);
+            _posDnReset = _posDn = new PointF(-_imgDn.Width + Width, (Height - 600) / 2f);
+            _posCr = new PointF(Width - _imgC.Width, (Height - 600) / 2f);
 
             _blkDn = new Rectangle(new Point(0, (int)_posSky.Y + _imgSky.Height), new Size(Width, (Height - 600) / 2));
         }
@@ -114,20 +113,20 @@ namespace ScreenSaverEf
 
         private void Form1_Paint(object sender, PaintEventArgs e)
         {
-            Graphics dc = e.Graphics;
-            if (timer1.Enabled)
+            var dc = e.Graphics;
+            if (UpdateTimer.Enabled)
             {
                 if (_posSky.X > 0 && _posSky.X <= Width)
                     dc.DrawImage(_imgSky, new PointF(-_imgSky.Width + _posSky.X, _posSky.Y));
                 if (_posSky.X > Width)
-                    _posSky.X = _posShyr.X;
+                    _posSky.X = _posSkyReset.X;
 
                 dc.DrawImage(_imgSky, _posSky);
 
                 if (_posDn.X > 0 && _posDn.X <= Width)
                     dc.DrawImage(_imgDn, new PointF(-_imgDn.Width + _posDn.X, _posDn.Y));
                 if (_posDn.X > Width)
-                    _posDn.X = _posDnr.X;
+                    _posDn.X = _posDnReset.X;
 
                 dc.DrawImage(_imgDn, _posDn);
 
@@ -138,16 +137,16 @@ namespace ScreenSaverEf
             }
             else
             {
-                dc.DrawString("点击开始", new Font("微软雅黑", 20), Brushes.White, ClientSize.Width / 2, ClientSize.Height / 2);
+                dc.DrawString("点击开始", new Font("微软雅黑", 20), Brushes.White, ClientSize.Width / 2f, ClientSize.Height / 2f);
             }
         }
 
         private void Form1_MouseClick(object sender, MouseEventArgs e)
         {
-            if (timer1.Enabled)
+            if (UpdateTimer.Enabled)
                 Application.Exit();
             else
-                timer1.Start();
+                UpdateTimer.Start();
         }
 
         private void Form1_Resize(object sender, EventArgs e)

ScrenSaverEf/MainForm.resx

@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="UpdateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

ScrenSaverEf/PreviewForm.cs

@@ -17,7 +17,7 @@ namespace ScreenSaverEf
         {
             InitializeComponent();
 
-            SetParent(this.Handle, hWndParent);//设置屏保预览窗口为FrmControl的父窗口
+            SetParent(this.Handle, hWndParent);//璁剧疆灞忎繚棰勮�绐楀彛涓篎rmControl鐨勭埗绐楀彛
 
             GetClientRect(hWndParent, out var parentRect);