Skip to content

Commit bf700a2

Browse files
bug: add scrollviewer around error message to prevent overflow (#154)
Fixes: #146 Fixes: #153 (disables Sign out during Connection/Disconnection) --------- Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com>
1 parent ac22fe4 commit bf700a2

File tree

6 files changed

+368
-284
lines changed

6 files changed

+368
-284
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
$ErrorActionPreference = "Stop"
4343
4444
$filename = ".\WindowsAppRuntimeInstall-x64.exe"
45-
$url = "https://download.microsoft.com/download/7a3a6a44-b07e-4ca5-8b63-2de185769dbc/WindowsAppRuntimeInstall-x64.exe" # 1.6.5 (1.6.250205002)
45+
$url = "https://aka.ms/windowsappsdk/1.8/1.8.250907003/windowsappruntimeinstall-x64.exe" # 1.8.0 (1.8.250907003)
4646
& curl.exe --progress-bar --show-error --fail --location --output $filename $url
4747
if ($LASTEXITCODE -ne 0) { throw "Failed to download Windows App SDK" }
4848

App/App.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@
6868
<PrivateAssets>all</PrivateAssets>
6969
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7070
</PackageReference>
71-
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.2.0" />
72-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
73-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
74-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
75-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
76-
<PackageReference Include="NetSparkleUpdater.SparkleUpdater" Version="3.0.2" />
71+
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
72+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
73+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
74+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.9" />
75+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
76+
<PackageReference Include="NetSparkleUpdater.SparkleUpdater" Version="3.0.3" />
7777
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
7878
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
79-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
80-
<PackageReference Include="WinUIEx" Version="2.5.1" />
79+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
80+
<PackageReference Include="WinUIEx" Version="2.8.0" />
8181
</ItemGroup>
8282

8383
<ItemGroup Condition="'$(Configuration)' == 'Debug'">

App/Views/Pages/TrayWindowDisconnectedPage.xaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,17 @@
3636
Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
3737
Text="Reconnect failed"/>
3838

39-
<TextBlock
40-
TextWrapping="Wrap"
41-
Margin="0,0,0,10"
42-
Foreground="Red"
43-
Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
44-
Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
39+
<ScrollViewer
40+
VerticalScrollBarVisibility="Auto"
41+
MaxHeight="500"
42+
Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
43+
44+
<TextBlock
45+
TextWrapping="Wrap"
46+
Margin="0,0,0,10"
47+
Foreground="Red"
48+
Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
49+
</ScrollViewer>
4550

4651
<HyperlinkButton
4752
HorizontalContentAlignment="Left"

App/Views/Pages/TrayWindowMainPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@
361361

362362
<HyperlinkButton
363363
Command="{x:Bind ViewModel.SignOutCommand, Mode=OneWay}"
364+
IsEnabled="{x:Bind ViewModel.VpnLifecycle, Converter={StaticResource NotConnectingBoolConverter}, Mode=OneWay}"
364365
Margin="-12,-4,-12,-4"
365366
HorizontalAlignment="Stretch"
366367
HorizontalContentAlignment="Left">

0 commit comments

Comments
 (0)