Browse Source

Merge branch 'master' into feature/load-writeable-bitmap-from-file

pull/5800/head
Dan Walmsley 5 years ago
parent
commit
5c42c19805
  1. 4
      native/Avalonia.Native/src/OSX/window.mm
  2. 5
      src/Avalonia.Controls/RelativePanel.cs

4
native/Avalonia.Native/src/OSX/window.mm

@ -1936,6 +1936,10 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
[NSApp setMenu:_menu];
}
else
{
[self showAppMenuOnly];
}
}
-(void) showAppMenuOnly

5
src/Avalonia.Controls/RelativePanel.cs

@ -55,7 +55,10 @@ namespace Avalonia.Controls
_childGraph.Measure(availableSize);
_childGraph.Reset(false);
var boundingSize = _childGraph.GetBoundingSize(Width.IsNaN(), Height.IsNaN());
var calcWidth = Width.IsNaN() && HorizontalAlignment != HorizontalAlignment.Stretch;
var calcHeight = Height.IsNaN() && VerticalAlignment != VerticalAlignment.Stretch;
var boundingSize = _childGraph.GetBoundingSize(calcWidth, calcHeight);
_childGraph.Reset();
_childGraph.Measure(boundingSize);
return boundingSize;

Loading…
Cancel
Save