From 32cfbe6578f2d4952eed49ddd3d6074d3f34895f Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 20 Jan 2023 15:30:27 +0800
Subject: [PATCH 1/2] fix: fix screen display in control catalog.

---
 samples/ControlCatalog/Pages/ScreenPage.cs | 82 +++++++++++++++++-----
 1 file changed, 63 insertions(+), 19 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index b5b80fb147..94fc4da7ef 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Globalization;
+using System.Linq;
+using System.Net.Http.Headers;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
@@ -12,6 +14,11 @@ namespace ControlCatalog.Pages
     public class ScreenPage : UserControl
     {
         private double _leftMost;
+        private double _topMost;
+        private IBrush _primaryBrush = SolidColorBrush.Parse("#FF0078D7");
+        private IBrush _defaultBrush = Brushes.LightGray;
+        private IPen _activePen = new Pen(Brushes.Black);
+        private IPen _defaultPen = new Pen(Brushes.DarkGray);
 
         protected override bool BypassFlowDirectionPolicies => true;
 
@@ -37,51 +44,88 @@ namespace ControlCatalog.Pages
             var drawBrush = Brushes.Black;
             Pen p = new Pen(drawBrush);
 
-            foreach (Screen screen in screens)
+            var activeScreen = w.Screens.ScreenFromBounds(new PixelRect(w.Position, PixelSize.FromSize(w.Bounds.Size, scaling)));
+            double maxBottom = 0;
+
+            for (int i = 0; i<screens.Count; i++ )
             {
+                var screen = screens[i];
+
                 if (screen.Bounds.X / 10f < _leftMost)
                 {
                     _leftMost = screen.Bounds.X / 10f;
                     Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
                     return;
                 }
+                if (screen.Bounds.Y / 10f < _topMost)
+                {
+                    _topMost = screen.Bounds.Y / 10f;
+                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+                    return;
+                }
+                bool primary = screen.IsPrimary;
+                bool active = screen.Equals(activeScreen);
 
-                Rect boundsRect = new Rect(screen.Bounds.X / 10f + Math.Abs(_leftMost), screen.Bounds.Y / 10f, screen.Bounds.Width / 10f,
+                Rect boundsRect = new Rect(screen.Bounds.X / 10f + Math.Abs(_leftMost), screen.Bounds.Y / 10f+Math.Abs(_topMost), screen.Bounds.Width / 10f,
                                   screen.Bounds.Height / 10f);
-                Rect workingAreaRect = new Rect(screen.WorkingArea.X / 10f + Math.Abs(_leftMost), screen.WorkingArea.Y / 10f, screen.WorkingArea.Width / 10f,
+                Rect workingAreaRect = new Rect(screen.WorkingArea.X / 10f + Math.Abs(_leftMost), screen.WorkingArea.Y / 10f+Math.Abs(_topMost), screen.WorkingArea.Width / 10f,
                                    screen.WorkingArea.Height / 10f);
 
-                context.DrawRectangle(p, boundsRect);
-                context.DrawRectangle(p, workingAreaRect);
+                context.DrawRectangle(primary ? _primaryBrush : _defaultBrush, active ? _activePen : _defaultPen, boundsRect);
+                context.DrawRectangle(primary ? _primaryBrush : _defaultBrush, active ? _activePen : _defaultPen, workingAreaRect);
+
+                var identifier = CreateScreenIdentifier((i+1).ToString(), primary);
+                var center = boundsRect.Center - new Point(identifier.Width / 2.0f, identifier.Height / 2.0f);
+
+                context.DrawText(identifier, center);
+                maxBottom = Math.Max(maxBottom, boundsRect.Bottom);
+            }
+
+            double currentHeight = maxBottom;
+
+            for(int i = 0; i< screens.Count; i++)
+            {
+                var screen = screens[i];
 
+                var formattedText = CreateFormattedText($"Screen {i+1}", 18);
+                context.DrawText(formattedText, new Point(0, currentHeight));
+                currentHeight += 25;
 
-                var formattedText = CreateFormattedText($"Bounds: {screen.Bounds.Width}:{screen.Bounds.Height}");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height));
+                formattedText = CreateFormattedText($"Bounds: {screen.Bounds.Width}:{screen.Bounds.Height}");
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
 
-                formattedText =
-                    CreateFormattedText($"WorkArea: {screen.WorkingArea.Width}:{screen.WorkingArea.Height}");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 20));
+                formattedText = CreateFormattedText($"WorkArea: {screen.WorkingArea.Width}:{screen.WorkingArea.Height}");
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
 
                 formattedText = CreateFormattedText($"Scaling: {screen.Scaling * 100}%");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 40));
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
 
                 formattedText = CreateFormattedText($"IsPrimary: {screen.IsPrimary}");
 
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 60));
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 20;
+
+                formattedText = CreateFormattedText( $"Current: {screen.Equals(activeScreen)}");
+                context.DrawText(formattedText, new Point(15, currentHeight));
+                currentHeight += 30;
 
-                formattedText =
-                    CreateFormattedText(
-                        $"Current: {screen.Equals(w.Screens.ScreenFromBounds(new PixelRect(w.Position, PixelSize.FromSize(w.Bounds.Size, scaling))))}");
-                context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 80));
             }
 
-            context.DrawRectangle(p, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f, w.Bounds.Width / 10, w.Bounds.Height / 10));
+            context.DrawRectangle(p, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f+Math.Abs(_topMost), w.Bounds.Width / 10, w.Bounds.Height / 10));
         }
 
-        private static FormattedText CreateFormattedText(string textToFormat)
+        private static FormattedText CreateFormattedText(string textToFormat, double size = 12)
         {
             return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-                Typeface.Default, 12, Brushes.Green);
+                Typeface.Default, size, Brushes.Green);
+        }
+
+        private static FormattedText CreateScreenIdentifier(string textToFormat, bool primary)
+        {
+            return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, Typeface.Default, 20, primary ? Brushes.White : Brushes.Black);
         }
     }
 }

From 163b88417123b390b880bb00e7625fb0ba2e8fbb Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 20 Jan 2023 15:47:57 +0800
Subject: [PATCH 2/2] fix: remove unused pen.

---
 samples/ControlCatalog/Pages/ScreenPage.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index 94fc4da7ef..2cdd031693 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -41,9 +41,6 @@ namespace ControlCatalog.Pages
             var screens = w.Screens.All;
             var scaling = ((IRenderRoot)w).RenderScaling;
 
-            var drawBrush = Brushes.Black;
-            Pen p = new Pen(drawBrush);
-
             var activeScreen = w.Screens.ScreenFromBounds(new PixelRect(w.Position, PixelSize.FromSize(w.Bounds.Size, scaling)));
             double maxBottom = 0;
 
@@ -114,7 +111,7 @@ namespace ControlCatalog.Pages
 
             }
 
-            context.DrawRectangle(p, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f+Math.Abs(_topMost), w.Bounds.Width / 10, w.Bounds.Height / 10));
+            context.DrawRectangle(_activePen, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f+Math.Abs(_topMost), w.Bounds.Width / 10, w.Bounds.Height / 10));
         }
 
         private static FormattedText CreateFormattedText(string textToFormat, double size = 12)