Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

bug: add scrollviewer around error message to prevent overflow#154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ibetitsmike merged 3 commits intomainfrommike/146-scrollviewer-error-wrap
Sep 22, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion.github/workflows/ci.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ jobs:
$ErrorActionPreference = "Stop"

$filename = ".\WindowsAppRuntimeInstall-x64.exe"
$url = "https://download.microsoft.com/download/7a3a6a44-b07e-4ca5-8b63-2de185769dbc/WindowsAppRuntimeInstall-x64.exe" # 1.6.5 (1.6.250205002)
$url = "https://aka.ms/windowsappsdk/1.8/1.8.250907003/windowsappruntimeinstall-x64.exe" # 1.8.0 (1.8.250907003)
& curl.exe --progress-bar --show-error --fail --location --output $filename $url
if ($LASTEXITCODE -ne 0) { throw "Failed to download Windows App SDK" }

Expand Down
16 changes: 8 additions & 8 deletionsApp/App.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,16 +68,16 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
<PackageReference Include="NetSparkleUpdater.SparkleUpdater" Version="3.0.2" />
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.9" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
<PackageReference Include="NetSparkleUpdater.SparkleUpdater" Version="3.0.3" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="WinUIEx" Version="2.5.1" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="WinUIEx" Version="2.8.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug'">
Expand Down
17 changes: 11 additions & 6 deletionsApp/Views/Pages/TrayWindowDisconnectedPage.xaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,17 @@
Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
Text="Reconnect failed"/>

<TextBlock
TextWrapping="Wrap"
Margin="0,0,0,10"
Foreground="Red"
Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
<ScrollViewer
VerticalScrollBarVisibility="Auto"
MaxHeight="500"
Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">

<TextBlock
TextWrapping="Wrap"
Margin="0,0,0,10"
Foreground="Red"
Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
</ScrollViewer>

<HyperlinkButton
HorizontalContentAlignment="Left"
Expand Down
1 change: 1 addition & 0 deletionsApp/Views/Pages/TrayWindowMainPage.xaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -361,6 +361,7 @@

<HyperlinkButton
Command="{x:Bind ViewModel.SignOutCommand, Mode=OneWay}"
IsEnabled="{x:Bind ViewModel.VpnLifecycle, Converter={StaticResource NotConnectingBoolConverter}, Mode=OneWay}"
Margin="-12,-4,-12,-4"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Left">
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp