Skip to content

Commit c1ea64d

Browse files
fix: add scrollviewer around the connect error display (#158)
Long error messages when connecting to a Coder deployment could cause the window to overflow. Simmilar issue as: #146. Errors are now limited to 500px by the ScrollViewer component. <img width="325" height="913" alt="image" src="https://github.com/user-attachments/assets/571503c5-9c6f-4d33-b9f8-1ae3530f72fa" /> --------- Co-authored-by: Dean Sheather <[email protected]>
1 parent fd99c1d commit c1ea64d

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

App/Views/Pages/DirectoryPickerMainPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<ScrollView Grid.Row="0">
4040
<TextBlock
4141
Margin="0,0,0,20"
42+
IsTextSelectionEnabled="True"
4243
Foreground="Red"
4344
TextWrapping="Wrap"
4445
Text="{x:Bind ViewModel.InitialLoadError, Mode=OneWay}" />

App/Views/Pages/FileSyncListMainPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<TextBlock
5151
Margin="0,0,0,20"
5252
Foreground="Red"
53+
IsTextSelectionEnabled="True"
5354
TextWrapping="Wrap"
5455
Text="{x:Bind ViewModel.Error, Mode=OneWay}" />
5556
</ScrollView>

App/Views/Pages/SignInUrlPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<TextBlock
5454
Grid.Column="1"
5555
Grid.Row="1"
56+
IsTextSelectionEnabled="True"
5657
Text="{x:Bind ViewModel.CoderUrlError, Mode=OneWay}"
5758
Foreground="Red" />
5859
</Grid>

App/Views/Pages/TrayWindowDisconnectedPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
TextWrapping="Wrap"
4646
Margin="0,0,0,10"
4747
Foreground="Red"
48+
IsTextSelectionEnabled="True"
4849
Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
4950
</ScrollViewer>
5051

App/Views/Pages/TrayWindowMainPage.xaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,18 @@
6262

6363
<controls:HorizontalRule />
6464

65-
<TextBlock
66-
Text="{x:Bind ViewModel.VpnFailedMessage, Mode=OneWay}"
67-
Foreground="Red"
68-
Margin="0,6,0,6"
69-
TextWrapping="Wrap"
70-
Visibility="{x:Bind ViewModel.ShowFailedSection, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
65+
<ScrollViewer
66+
VerticalScrollBarVisibility="Auto"
67+
MaxHeight="500"
68+
Visibility="{x:Bind ViewModel.ShowFailedSection, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" >
7169

70+
<TextBlock
71+
Text="{x:Bind ViewModel.VpnFailedMessage, Mode=OneWay}"
72+
Foreground="Red"
73+
IsTextSelectionEnabled="True"
74+
Margin="0,6,0,6"
75+
TextWrapping="Wrap" />
76+
</ScrollViewer>
7277
<TextBlock
7378
Text="Enable Coder Connect to view your workspaces."
7479
TextWrapping="Wrap"

0 commit comments

Comments
 (0)