Skip to content

Commit f570aa7

Browse files
author
Thomas Felices
committed
Fix uniform grid on connection settings [VPNWIN-2890]
1 parent 9c92c94 commit f570aa7

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

‎src/Client/Common/ProtonVPN.Client.Common.UI/Styles/Controls/SettingsCardStyles.xaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.-->
7474
<Thickness x:Key="GridSettingsCardPadding">16</Thickness>
7575
<x:Double x:Key="SettingsCardMinWidth">120</x:Double>
7676
<x:Double x:Key="SettingsCardMinHeight">54</x:Double>
77+
<x:Double x:Key="GridSettingsCardMinWidth">120</x:Double>
78+
<x:Double x:Key="GridSettingsCardMinHeight">117</x:Double>
7779
<x:Double x:Key="SettingsCardDescriptionFontSize">12</x:Double>
7880
<x:Double x:Key="SettingsCardHeaderIconMaxSize">20</x:Double>
7981
<x:Double x:Key="SettingsCardLeftIndention">0</x:Double>
@@ -967,14 +969,13 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.-->
967969
<Setter Property="BorderBrush" Value="{ThemeResource SettingsCardBorderBrush}" />
968970
<Setter Property="BorderThickness" Value="{ThemeResource SettingsCardBorderThickness}" />
969971
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
970-
<Setter Property="MinHeight" Value="{StaticResource SettingsCardMinHeight}" />
971-
<Setter Property="MinWidth" Value="{StaticResource SettingsCardMinWidth}" />
972+
<Setter Property="MinHeight" Value="{StaticResource GridSettingsCardMinHeight}" />
973+
<Setter Property="MinWidth" Value="{StaticResource GridSettingsCardMinWidth}" />
972974
<Setter Property="IsTabStop" Value="True" />
973975
<Setter Property="HorizontalAlignment" Value="Stretch" />
974976
<Setter Property="HorizontalContentAlignment" Value="Right" />
975977
<Setter Property="VerticalAlignment" Value="Stretch" />
976978
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
977-
<Setter Property="Padding" Value="{StaticResource SettingsCardPadding}" />
978979
<Setter Property="Padding" Value="{StaticResource GridSettingsCardPadding}" />
979980
<Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}" />
980981
<Setter Property="FontWeight" Value="Normal" />

‎src/Client/ProtonVPN.Client/UI/Main/Settings/Pages/Connection/ConnectionSettingsView.xaml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
5050
Columns="3"
5151
ColumnSpacing="8">
5252

53-
<custom:GridSettingsCard x:Name="Item1"
54-
AutomationProperties.AutomationId="ProtocolSettingsCard"
53+
<custom:GridSettingsCard AutomationProperties.AutomationId="ProtocolSettingsCard"
5554
Command="{x:Bind ViewModel.NavigateToProtocolPageCommand, Mode=OneTime}"
5655
Header="{x:Bind ViewModel.Localizer.Get('Settings_Connection_Protocol')}"
5756
IsClickEnabled="True"
@@ -73,8 +72,7 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
7372
</custom:GridSettingsCard.ActionIcon>
7473
</custom:GridSettingsCard>
7574

76-
<custom:GridSettingsCard x:Name="Item2"
77-
AutomationProperties.AutomationId="NetShieldSettingsCard"
75+
<custom:GridSettingsCard AutomationProperties.AutomationId="NetShieldSettingsCard"
7876
Command="{x:Bind ViewModel.NavigateToNetShieldPageCommand, Mode=OneTime}"
7977
Header="{x:Bind ViewModel.Localizer.Get('Settings_Connection_NetShield')}"
8078
IsClickEnabled="True"
@@ -97,8 +95,7 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
9795
</custom:GridSettingsCard.ActionIcon>
9896
</custom:GridSettingsCard>
9997

100-
<custom:GridSettingsCard x:Name="Item3"
101-
AutomationProperties.AutomationId="KillSwitchSettingsCard"
98+
<custom:GridSettingsCard AutomationProperties.AutomationId="KillSwitchSettingsCard"
10299
Command="{x:Bind ViewModel.NavigateToKillSwitchPageCommand, Mode=OneTime}"
103100
Description="{x:Bind ViewModel.KillSwitchSettingsState}"
104101
Header="{x:Bind ViewModel.Localizer.Get('Settings_Connection_KillSwitch')}"
@@ -112,8 +109,7 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
112109
</custom:GridSettingsCard.ActionIcon>
113110
</custom:GridSettingsCard>
114111

115-
<custom:GridSettingsCard x:Name="Item4"
116-
AutomationProperties.AutomationId="PortForwardingSettingsCard"
112+
<custom:GridSettingsCard AutomationProperties.AutomationId="PortForwardingSettingsCard"
117113
Command="{x:Bind ViewModel.NavigateToPortForwardingPageCommand, Mode=OneTime}"
118114
Header="{x:Bind ViewModel.Localizer.Get('Settings_Connection_PortForwarding')}"
119115
IsClickEnabled="True"
@@ -136,8 +132,7 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
136132
</custom:GridSettingsCard.ActionIcon>
137133
</custom:GridSettingsCard>
138134

139-
<custom:GridSettingsCard x:Name="Item5"
140-
AutomationProperties.AutomationId="SplitTunnelingSettingsCard"
135+
<custom:GridSettingsCard AutomationProperties.AutomationId="SplitTunnelingSettingsCard"
141136
Command="{x:Bind ViewModel.NavigateToSplitTunnelingPageCommand, Mode=OneTime}"
142137
Description="{x:Bind ViewModel.SplitTunnelingSettingsState}"
143138
Header="{x:Bind ViewModel.Localizer.Get('Settings_Connection_SplitTunneling')}"
@@ -152,8 +147,7 @@ along with ProtonVPN. If not, see <https://www.gnu.org/licenses/>.
152147
</custom:GridSettingsCard.ActionIcon>
153148
</custom:GridSettingsCard>
154149

155-
<custom:GridSettingsCard x:Name="Item6"
156-
AutomationProperties.AutomationId="VpnAcceleratorSettingsCard"
150+
<custom:GridSettingsCard AutomationProperties.AutomationId="VpnAcceleratorSettingsCard"
157151
Command="{x:Bind ViewModel.NavigateToVpnAcceleratorPageCommand, Mode=OneTime}"
158152
Description="{x:Bind ViewModel.VpnAcceleratorSettingsState}"
159153
Header="{x:Bind ViewModel.Localizer.Get('Settings_Connection_VpnAccelerator')}"

0 commit comments

Comments
 (0)