Changeset 2245 for trunk/eraser

Timestamp:

9/24/2010 2:21:27 AM (3 years ago)

Author:

lowjoel

Message:

Added a DPI-aware version of the about dialog. There are some hacks here (notably the scale-down of the font size) but it works... Maybe we can review this when we rewrite the code to use DirectWrite??

Location:

trunk/eraser/Eraser

Files:

• AboutForm.Designer.cs (modified) (1 diff)
• AboutForm.cs (modified) (4 diffs)
• AboutForm.resx (modified) (1 diff)

trunk/eraser/Eraser/AboutForm.Designer.cs

@@ -68 +68 @@
             // AboutForm
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
             resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "AboutForm";
             this.ShowInTaskbar = false;
+            this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.AboutForm_MouseUp);
+            this.Paint += new System.Windows.Forms.PaintEventHandler(this.AboutForm_Paint);
             this.Click += new System.EventHandler(this.AboutForm_Click);
-            this.Paint += new System.Windows.Forms.PaintEventHandler(this.AboutForm_Paint);
             this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AboutForm_MouseDown);
             this.MouseLeave += new System.EventHandler(this.AboutForm_MouseLeave);
             this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.AboutForm_MouseMove);
-            this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.AboutForm_MouseUp);
             this.ResumeLayout(false);
 

trunk/eraser/Eraser/AboutForm.cs

@@ -62 +62 @@
             Left = point.X;
             Top = point.Y;
+
+            //Get the parent dialog's screen buffer.
+            ParentBitmap = new Bitmap(parent.ClientSize.Width, parent.ClientSize.Height);
+            using (Graphics dest = Graphics.FromImage(ParentBitmap))
+            {
+                parent.Refresh();
+                Point parentPos = parent.PointToScreen(new Point(0, 0));
+                dest.CopyFromScreen(parentPos, new Point(0, 0), parent.ClientSize);
+            }
 
             //Load the localised About Text
@@ -100 +109 @@
             //Create the About bitmap localised for the current version (sans scrolling
             //text) so it can be drawn quickly later.
-            AboutBitmap = Properties.Resources.AboutDialog;
-            AboutBitmap = AboutBitmap.Clone(new Rectangle(0, 0, AboutBitmap.Width,
-                AboutBitmap.Height), PixelFormat.DontCare);
+            //First, duplicate the bitmap and scale it according to the resolution of the
+            //monitor.
+            float dpiScale = 0f;
+            using (Graphics controlDC = CreateGraphics())
+            {
+                Debug.Assert(controlDC.DpiX == controlDC.DpiY);
+                dpiScale = controlDC.DpiX / 96.0f;
+            }
+
+            Bitmap sourceBitmap = Properties.Resources.AboutDialog;
+            AboutBitmap = new Bitmap((int)(sourceBitmap.Width * dpiScale),
+                (int)(sourceBitmap.Height * dpiScale));
             using (Graphics g = Graphics.FromImage(AboutBitmap))
             {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                g.ScaleTransform(dpiScale, dpiScale);
+                g.DrawImage(sourceBitmap, Point.Empty);
+
+                //Scale the font down since we will be using a scale transform later.
+                Font = new Font(Font.FontFamily, Font.SizeInPoints / dpiScale);
+
                 //Version number
                 Font boldFont = new Font(Font, FontStyle.Bold);
@@ -152 +177 @@
             AboutBitmapPos = new Point((ClientSize.Width - AboutBitmap.Width) / 2,
                 (ClientSize.Height - AboutBitmap.Height) / 2);
-            WebsiteRect.X += AboutBitmapPos.X;
-            WebsiteRect.Y += AboutBitmapPos.Y;
-            DonateRect.X += AboutBitmapPos.X;
-            DonateRect.Y += AboutBitmapPos.Y;
+            WebsiteRect.X = (int)(WebsiteRect.X * dpiScale + AboutBitmapPos.X);
+            WebsiteRect.Y = (int)(WebsiteRect.Y * dpiScale + AboutBitmapPos.Y);
+            WebsiteRect.Width = (int)(WebsiteRect.Width * dpiScale);
+            WebsiteRect.Height = (int)(WebsiteRect.Height * dpiScale);
+            DonateRect.X = (int)(DonateRect.X * dpiScale + AboutBitmapPos.X);
+            DonateRect.Y = (int)(DonateRect.Y * dpiScale + AboutBitmapPos.Y);
+            DonateRect.Width = (int)(DonateRect.Width * dpiScale);
+            DonateRect.Height = (int)(DonateRect.Height * dpiScale);
 
             //And calculate the bounds of the About Text.
-            AboutTextRect = new Rectangle(AboutBitmapPos.X + 19 + 149, AboutBitmapPos.Y + 20 + 147,
-                AboutBitmap.Width - 19 - 149 - 20, 130);
+            AboutTextRect = Rectangle.Truncate(new RectangleF(
+                AboutBitmapPos.X + (19 + 149) * dpiScale,
+                AboutBitmapPos.Y + (20 + 147) * dpiScale,
+                AboutBitmap.Width - (19 + 149 + 20) * dpiScale,
+                130 * dpiScale));
 
             //Create the About Text laid out on screen.
@@ -165 +197 @@
             using (Bitmap b = new Bitmap(1, 1))
             using (Graphics g = Graphics.FromImage(b))
+            {
+                g.ScaleTransform(dpiScale, dpiScale);
                 aboutTextSize = g.MeasureString(AboutText, Font, AboutTextRect.Width);
+            }
             AboutTextBitmap = new Bitmap(AboutTextRect.Width, (int)aboutTextSize.Height);
             using (Graphics g = Graphics.FromImage(AboutTextBitmap))
             {
                 g.Clear(Color.FromArgb(0, 0, 0, 0));
-                g.DrawString(AboutText, Font, new SolidBrush(Color.White), new RectangleF(
-                    0.0f, 0.0f, AboutTextRect.Width, aboutTextSize.Height));
-            }
-
-            //Get the parent dialog's screen buffer.
-            ParentBitmap = new Bitmap(parent.ClientSize.Width, parent.ClientSize.Height);
-            using (Graphics dest = Graphics.FromImage(ParentBitmap))
-            {
-                parent.Refresh();
-                Point parentPos = parent.PointToScreen(new Point(0, 0));
-                dest.CopyFromScreen(parentPos, new Point(0, 0), parent.ClientSize);
+                g.ScaleTransform(dpiScale, dpiScale);
+                g.DrawString(AboutText, Font, new SolidBrush(Color.White),
+                    new RectangleF(0.0f, 0.0f, AboutTextBitmap.Width / dpiScale,
+                        AboutTextBitmap.Height / dpiScale));
             }
 

trunk/eraser/Eraser/AboutForm.resx

@@ -125 +125 @@
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>96, 96</value>
+  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>568, 326</value>