Merge branch 'master' into refreshinterval
This commit is contained in:
commit
3737f5cefe
@ -1,7 +1,8 @@
|
||||
<Styles
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
|
||||
<Design.PreviewWith>
|
||||
<Border Height="2000"
|
||||
Padding="20">
|
||||
@ -231,7 +232,7 @@
|
||||
<Setter Property="BorderBrush"
|
||||
Value="{DynamicResource HighlightBrush}" />
|
||||
</Style>
|
||||
<Style Selector="Button">
|
||||
<Style Selector="Button:not(windowing|MinMaxCloseControl Button)">
|
||||
<Setter Property="MinWidth"
|
||||
Value="80" />
|
||||
</Style>
|
||||
|
@ -6,8 +6,10 @@
|
||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:viewModel="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||
Width="550"
|
||||
Height="260"
|
||||
MinWidth="550"
|
||||
MinHeight="260"
|
||||
MaxWidth="600"
|
||||
MaxHeight="500"
|
||||
Margin="0,-12,0,0"
|
||||
d:DesignHeight="260"
|
||||
d:DesignWidth="550"
|
||||
|
Loading…
x
Reference in New Issue
Block a user