Toasts – Diff between revs 49 and 50

Subversion Repositories:

?pathlinks?

Rev 49 – Rev 52 – Go to most recent revision – Details – Blame – Last modification – View Log

         public FormAnimator.AnimationMethod AnimationMethodDetached { get; set; } = FormAnimator.AnimationMethod.Fade;
         public FormAnimator.AnimationDirection AnimationDirectionDetached { get; set; } = FormAnimator.AnimationDirection.None;
-        public FormAnimator.AnimationMethod AnimationMethod { get; set; } = FormAnimator.AnimationMethod.Slide;
+        public FormAnimator.AnimationMethod AnimationMethod { get; set; } = FormAnimator.AnimationMethod.Fade;
                 components.Dispose();
+            }
             if (_toastTimer != null)
+            {
                 _toastTimer.Stop();
                 _toastTimer.Dispose();
                 _toastTimer = null;
+            }
                     Invoke(new MethodInvoker(() =>
+                    {
                         // compute notification height from body
+                        var maxWidth = tableLayoutPanel4.Width;
-                        var maxWidth = tableLayoutPanel4.Width;
-                        using (var m_Bitmap = new Bitmap(64, 64))
+                        switch (ContentType)
+                        {
-                        {
+                            case "text/markdown":
-                            using (var graphics = Graphics.FromImage(m_Bitmap))
+                                var htmlDocument = new HtmlAgilityPack.HtmlDocument();
-                            {
+                                var panelText = htmlPanel1.Text;
-                                switch (ContentType)
+                                if (!string.IsNullOrEmpty(panelText))
                                 {
-                                    case "text/markdown":
+                                    htmlDocument.LoadHtml(panelText);
+                                    if (htmlDocument.DocumentNode != null && htmlDocument.DocumentNode.Descendants().Any())
-                                        var htmlDocument = new HtmlAgilityPack.HtmlDocument();
+                                    {
-                                        var panelText = htmlPanel1.Text;
+                                        var imgNodes = htmlDocument.DocumentNode.SelectNodes("//img");
-                                        if (!string.IsNullOrEmpty(panelText))
+                                        if (imgNodes != null && imgNodes.Any())
                                         {
-                                            htmlDocument.LoadHtml(panelText);
-                                            if (htmlDocument.DocumentNode != null && htmlDocument.DocumentNode.Descendants().Any())
+                                            foreach (var node in imgNodes)
-                                            {
-                                                var imgNodes = htmlDocument.DocumentNode.SelectNodes("//img");
-                                                if (imgNodes != null && imgNodes.Any())
-                                                {
-                                                    foreach (var node in imgNodes)
-                                                    {
+                                            {
-                                                        node.SetAttributeValue("style", $"max-width: {maxWidth}px");
-                                                    }
                                                 node.SetAttributeValue("style", $"max-width: {maxWidth}px");
-                                            }
                                             htmlPanel1.Text = htmlDocument.DocumentNode.WriteTo();
-                                        }
-                                        break;
-                                    default:
-                                        break;
+                                        }
-                                }
-                                PointF point = new PointF(0, 0);
-                                SizeF maxSize = new SizeF(maxWidth, Screen.PrimaryScreen.WorkingArea.Height);
-                                var renderSize = HtmlRender.Render(graphics, htmlPanel1.Text, point, maxSize);
-                                // total height = height of text fitting in rectangle + the height of the title on top + one extra line for the last line wrap
-                                var computedOptimalHeight = (int)Math.Round(renderSize.Height) + labelTitle.Height + (int)Math.Round(htmlPanel1.Font.GetHeight());
-                                // keep the default height of a notification constant
-                                if (computedOptimalHeight > Height)
+                                    }
+                                    htmlPanel1.Text = htmlDocument.DocumentNode.WriteTo();
+                                }
+                                break;
+                            default:
+                                break;
+                        }
+                        //var maxSize = new Size(maxWidth, Screen.PrimaryScreen.WorkingArea.Height);
+                        using (var image = HtmlRender.RenderToImage(htmlPanel1.Text, maxWidth, 0, Color.Empty))
+                        {
+                            var height = image.Height + labelTitle.Height;
+                            if(height > Height)
                                     Height = computedOptimalHeight;
                                 Height = height;
+                            }
+                        }