Skip to content

Commit 6563620

Browse files
committed
Fix: Set correct size for dpi
1 parent 0b714ba commit 6563620

File tree

5 files changed

+157
-166
lines changed

5 files changed

+157
-166
lines changed

Source/NETworkManager/Controls/RemoteDesktopControl.xaml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@
99
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
1010
xmlns:local="clr-namespace:NETworkManager.Controls"
1111
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
12-
mc:Ignorable="d" Loaded="UserControl_Loaded"
12+
xmlns:windowsForms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
13+
mc:Ignorable="d" Loaded="UserControl_Loaded"
1314
d:DataContext="{d:DesignInstance local:RemoteDesktopControl}">
1415
<local:UserControlBase.Resources>
1516
<converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
1617
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
1718
<converters:BooleanReverseToVisibilityHiddenConverter x:Key="BooleanReverseToVisibilityHiddenConverter" />
1819
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
1920
</local:UserControlBase.Resources>
20-
<Grid x:Name="RdpGrid" SizeChanged="RdpGrid_SizeChanged">
21-
<WindowsFormsHost MaxWidth="{Binding RdpClientWidth, Mode=OneWay}"
22-
MaxHeight="{Binding RdpClientHeight, Mode=OneWay}"
23-
Background="{DynamicResource ResourceKey=MahApps.Brushes.Window.Background}"
21+
<Grid x:Name="RdpGrid">
22+
<WindowsFormsHost MaxWidth="{Binding WindowsFormsHostMaxWidth, Mode=OneWay}"
23+
MaxHeight="{Binding WindowsFormsHostMaxHeight, Mode=OneWay}"
24+
Background="{DynamicResource ResourceKey=MahApps.Brushes.Window.Background}"
2425
DpiChanged="WindowsFormsHost_DpiChanged">
2526
<WindowsFormsHost.Style>
2627
<Style TargetType="{x:Type WindowsFormsHost}">
@@ -32,10 +33,7 @@
3233
</DataTrigger>
3334
<DataTrigger Binding="{Binding IsConnected}" Value="False">
3435
<Setter Property="Visibility" Value="Hidden" />
35-
</DataTrigger>
36-
<DataTrigger Binding="{Binding IsReconnecting}" Value="True">
37-
<Setter Property="Visibility" Value="Hidden" />
38-
</DataTrigger>
36+
</DataTrigger>
3937
</Style.Triggers>
4038
</Style>
4139
</WindowsFormsHost.Style>
@@ -66,18 +64,6 @@
6664
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}"
6765
Style="{StaticResource MessageTextBlock}"
6866
Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
69-
</Grid>
70-
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center"
71-
Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
72-
<Grid.RowDefinitions>
73-
<RowDefinition Height="Auto" />
74-
<RowDefinition Height="Auto" />
75-
<RowDefinition Height="20" />
76-
<RowDefinition Height="Auto" />
77-
</Grid.RowDefinitions>
78-
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" />
79-
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}"
80-
Style="{StaticResource MessageTextBlock}" />
81-
</Grid>
67+
</Grid>
8268
</Grid>
8369
</local:UserControlBase>

0 commit comments

Comments
 (0)