Skip to content

Commit e7116f6

Browse files
authored
Feature: Scale RDP session based on per monitor DPI & make reconnect faster (#2968)
* Feature: Scale rdp session and use UpdateSessionDisplaySettings instead of reconnect * Chore: Cleanup * Fix: Set correct size for dpi * Fix: Rounding issue * Feature: RDP scaling * Docs: ...
1 parent 6d2c6a1 commit e7116f6

File tree

8 files changed

+343
-125
lines changed

8 files changed

+343
-125
lines changed

Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private void RemoteDesktop_FullscreenAction(object view)
212212
private void RemoteDesktop_AdjustScreenAction(object view)
213213
{
214214
if (view is RemoteDesktopControl control)
215-
control.AdjustScreen();
215+
control.AdjustScreen(force:true);
216216
}
217217

218218
public ICommand RemoteDesktop_SendCtrlAltDelCommand =>

Source/NETworkManager/Controls/IDragablzTabItem.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ public interface IDragablzTabItem
1313
/// </summary>
1414
public void CloseTab()
1515
{
16+
1617
}
1718
}

Source/NETworkManager/Controls/RemoteDesktopControl.xaml

Lines changed: 9 additions & 23 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+
mc:Ignorable="d" Loaded="UserControl_Loaded"
1313
d:DataContext="{d:DesignInstance local:RemoteDesktopControl}">
1414
<local:UserControlBase.Resources>
1515
<converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
1616
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
1717
<converters:BooleanReverseToVisibilityHiddenConverter x:Key="BooleanReverseToVisibilityHiddenConverter" />
1818
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
1919
</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}">
20+
<Grid x:Name="RdpGrid">
21+
<WindowsFormsHost MaxWidth="{Binding WindowsFormsHostMaxWidth, Mode=OneWay}"
22+
MaxHeight="{Binding WindowsFormsHostMaxHeight, Mode=OneWay}"
23+
Background="{DynamicResource ResourceKey=MahApps.Brushes.Window.Background}"
24+
DpiChanged="WindowsFormsHost_DpiChanged">
2425
<WindowsFormsHost.Style>
2526
<Style TargetType="{x:Type WindowsFormsHost}">
2627
<Style.Triggers>
@@ -31,14 +32,11 @@
3132
</DataTrigger>
3233
<DataTrigger Binding="{Binding IsConnected}" Value="False">
3334
<Setter Property="Visibility" Value="Hidden" />
34-
</DataTrigger>
35-
<DataTrigger Binding="{Binding IsReconnecting}" Value="True">
36-
<Setter Property="Visibility" Value="Hidden" />
37-
</DataTrigger>
35+
</DataTrigger>
3836
</Style.Triggers>
3937
</Style>
4038
</WindowsFormsHost.Style>
41-
<mstsc:AxMsRdpClient9NotSafeForScripting x:Name="RdpClient" />
39+
<mstsc:AxMsRdpClient10NotSafeForScripting x:Name="RdpClient" />
4240
</WindowsFormsHost>
4341
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center"
4442
Visibility="{Binding IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
@@ -65,18 +63,6 @@
6563
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}"
6664
Style="{StaticResource MessageTextBlock}"
6765
Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
68-
</Grid>
69-
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center"
70-
Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
71-
<Grid.RowDefinitions>
72-
<RowDefinition Height="Auto" />
73-
<RowDefinition Height="Auto" />
74-
<RowDefinition Height="20" />
75-
<RowDefinition Height="Auto" />
76-
</Grid.RowDefinitions>
77-
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" />
78-
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}"
79-
Style="{StaticResource MessageTextBlock}" />
80-
</Grid>
66+
</Grid>
8167
</Grid>
8268
</local:UserControlBase>

0 commit comments

Comments
 (0)