Additional sanity checks for monitor resolution

donandren · Jan 20, 2020 · 7e42523 · 7e42523
1 parent 32df775
commit 7e42523
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
@@ -102,7 +102,7 @@ public X11Window(AvaloniaX11Platform platform, IWindowImpl popupParent)
                 valueMask |= SetWindowValuemask.ColorMap;   
             }
 
-            int defaultWidth = 300, defaultHeight = 200;
+            int defaultWidth = 0, defaultHeight = 0;
 
             if (!_popup && Screen != null)
             {
@@ -117,6 +117,10 @@ public X11Window(AvaloniaX11Platform platform, IWindowImpl popupParent)
                 }
             }
 
+            // check if the calculated size is zero then compensate to hardcoded resolution
+            defaultWidth = Math.Max(defaultWidth, 300);
+            defaultHeight = Math.Max(defaultHeight, 200);
+
             _handle = XCreateWindow(_x11.Display, _x11.RootWindow, 10, 10, defaultWidth, defaultHeight, 0,
                 depth,
                 (int)CreateWindowArgs.InputOutput, 
@@ -133,7 +137,7 @@ public X11Window(AvaloniaX11Platform platform, IWindowImpl popupParent)
                 _renderHandle = _handle;
 
             Handle = new PlatformHandle(_handle, "XID");
-            _realSize = new PixelSize(300, 200);
+            _realSize = new PixelSize(defaultWidth, defaultHeight);
             platform.Windows[_handle] = OnEvent;
             XEventMask ignoredMask = XEventMask.SubstructureRedirectMask
                                      | XEventMask.ResizeRedirectMask