From 8016a3d1c755b5ee91ad1097d9cc73220214c6ab Mon Sep 17 00:00:00 2001
From: Gabriela Trutan <gabriela.trutan@sonarsource.com>
Date: Fri, 27 Dec 2024 17:01:41 +0100
Subject: [PATCH 1/3] SLVS-1651 Fix "manage connextions" and "select project"
 buttons not being aligned.

---
 .../UI/ManageBinding/ManageBindingDialog.xaml | 106 ++++++++++--------
 1 file changed, 60 insertions(+), 46 deletions(-)

diff --git a/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml b/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
index dfa3b39cb..407172ec7 100644
--- a/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
+++ b/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
@@ -100,58 +100,72 @@
             </Grid>
         </GroupBox>
 
-        <Grid Grid.Row="1" Margin="0, 15">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
+        <Grid Grid.Row="1" Margin="0, 15" Grid.IsSharedSizeScope="True">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
+            <Grid Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="ButtonColumn"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static res:UiResources.ConnectionToBindLabel}" Margin="0,15,0,5"/>
+                <ComboBox Grid.Row="1" Grid.Column="0" ItemsSource="{Binding Path=Connections}" 
+                          SelectedItem="{Binding Path=SelectedConnectionInfo}" IsEnabled="{Binding Path=IsConnectionSelectionEnabled}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <ui:ConnectionInfoComponent ConnectionInfo="{Binding Path=.}" TextFontWeight="Normal" ImageMargin="0" TextAndIconVerticalAlignment="Center"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+                <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Padding="5,0" Text="{Binding Path=ConnectionSelectionCaptionText}"
+                           Style="{StaticResource CaptionTextBlock}"
+                           Visibility="{Binding  Path=IsConnectionSelected, Converter={StaticResource TrueToCollapsedConverter}}"/>
+                <Button Grid.Row="1" Grid.Column="1" Content="{x:Static res:UiResources.ManageConnectionsButton}" HorizontalAlignment="Right"
+                        IsEnabled="{Binding Path=IsManageConnectionsButtonEnabled}" Click="ManageConnections_OnClick"/>
+            </Grid>
 
-            <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static res:UiResources.ConnectionToBindLabel}" Margin="0,15,0,5"/>
-            <ComboBox Grid.Row="1" Grid.Column="0" ItemsSource="{Binding Path=Connections}" 
-                      SelectedItem="{Binding Path=SelectedConnectionInfo}" IsEnabled="{Binding Path=IsConnectionSelectionEnabled}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <ui:ConnectionInfoComponent ConnectionInfo="{Binding Path=.}" TextFontWeight="Normal" ImageMargin="0" TextAndIconVerticalAlignment="Center"/>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-            <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Padding="5,0" Text="{Binding Path=ConnectionSelectionCaptionText}"
-                       Style="{StaticResource CaptionTextBlock}"
-                       Visibility="{Binding  Path=IsConnectionSelected, Converter={StaticResource TrueToCollapsedConverter}}"/>
-            <Button Grid.Row="1" Grid.Column="1" Content="{x:Static res:UiResources.ManageConnectionsButton}" HorizontalAlignment="Right"
-                    IsEnabled="{Binding Path=IsManageConnectionsButtonEnabled}" Click="ManageConnections_OnClick"/>
-
-
-            <TextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static res:UiResources.ProjectToBindLabel}" Margin="0,15,0,5"/>
-            <Border Grid.Row="3" Grid.Column="0" BorderBrush="{DynamicResource {x:Static vsShell:VsBrushes.ActiveBorderKey}}" BorderThickness="1" Height="30"
-                    Background="{Binding ElementName=ConnectionsCombobox, Path=Background}">
-                <TextBlock VerticalAlignment="Center" Padding="5,0">
-                    <TextBlock.Style>
-                        <Style TargetType="TextBlock">
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Path=IsProjectSelected}" Value="False">
-                                    <Setter Property="Text" Value="{x:Static res:UiResources.SelectProjectToBindDescription}"/>
-                                    <Setter Property="FontStyle" Value="Italic"/>
-                                    <Setter Property="Foreground" Value="{StaticResource DisabledText}"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding Path=IsProjectSelected}" Value="True">
-                                    <Setter Property="Text" Value="{Binding Path=SelectedProject.Name}"/>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-            </Border>
-
-            <Button Grid.Row="3" Grid.Column="1" Content="{x:Static res:UiResources.SelectProjectButton}" Margin="15,0,0,0" Click="SelectProject_OnClick" 
-                    IsEnabled="{Binding  Path=IsSelectProjectButtonEnabled}"/>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="ButtonColumn"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static res:UiResources.ProjectToBindLabel}" Margin="0,15,0,5"/>
+                <Border Grid.Row="1" Grid.Column="0" BorderBrush="{DynamicResource {x:Static vsShell:VsBrushes.ActiveBorderKey}}" BorderThickness="1" Height="30"
+                        Background="{Binding ElementName=ConnectionsCombobox, Path=Background}">
+                    <TextBlock VerticalAlignment="Center" Padding="5,0">
+                        <TextBlock.Style>
+                            <Style TargetType="TextBlock">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Path=IsProjectSelected}" Value="False">
+                                        <Setter Property="Text" Value="{x:Static res:UiResources.SelectProjectToBindDescription}"/>
+                                        <Setter Property="FontStyle" Value="Italic"/>
+                                        <Setter Property="Foreground" Value="{StaticResource DisabledText}"/>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding Path=IsProjectSelected}" Value="True">
+                                        <Setter Property="Text" Value="{Binding Path=SelectedProject.Name}"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBlock.Style>
+                    </TextBlock>
+                </Border>
+
+                <Button Grid.Row="1" Grid.Column="1" Content="{x:Static res:UiResources.SelectProjectButton}" Click="SelectProject_OnClick" 
+                        IsEnabled="{Binding  Path=IsSelectProjectButtonEnabled}"/>
+            </Grid>
         </Grid>
 
         <Grid Grid.Row="2" Margin="0,10">

From 1d9a3a55505c3b7ada2b9f180466636f0256a149 Mon Sep 17 00:00:00 2001
From: Gabriela Trutan <gabriela.trutan@sonarsource.com>
Date: Fri, 27 Dec 2024 17:44:37 +0100
Subject: [PATCH 2/3] SLVS-1651 Fix connection name vizualization for longer
 names in the combobox from Manage Binding dialog

---
 src/ConnectedMode/UI/ConnectionInfoComponent.xaml           | 6 ++++--
 src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ConnectedMode/UI/ConnectionInfoComponent.xaml b/src/ConnectedMode/UI/ConnectionInfoComponent.xaml
index 27db3c0e2..314730ef7 100644
--- a/src/ConnectedMode/UI/ConnectionInfoComponent.xaml
+++ b/src/ConnectedMode/UI/ConnectionInfoComponent.xaml
@@ -19,8 +19,8 @@
 
     <Grid DataContext="{Binding ElementName=ConnectionInfoUc, Path=ConnectionInfo}">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition />
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
         <Image Grid.Column="0" Height="25" Margin="{Binding ElementName=ConnectionInfoUc, Path= ImageMargin}"
@@ -41,6 +41,8 @@
         </Image>
         <TextBlock x:Name="IdTextBlock" Grid.Column="1" Text="{Binding Path=Id}"
                    Margin="5,0,0,0"
+                   TextWrapping="Wrap"
+                   TextTrimming="CharacterEllipsis"
                    VerticalAlignment="{Binding ElementName=ConnectionInfoUc, Path=TextAndIconVerticalAlignment}"
                    FontWeight="{Binding ElementName=ConnectionInfoUc, Path=TextFontWeight}" />
     </Grid>
diff --git a/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml b/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
index 407172ec7..b9f526165 100644
--- a/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
+++ b/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
@@ -117,11 +117,12 @@
                 </Grid.RowDefinitions>
 
                 <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static res:UiResources.ConnectionToBindLabel}" Margin="0,15,0,5"/>
-                <ComboBox Grid.Row="1" Grid.Column="0" ItemsSource="{Binding Path=Connections}" 
+                <ComboBox x:Name="ConnectionsComboBox" Grid.Row="1" Grid.Column="0" ItemsSource="{Binding Path=Connections}" 
                           SelectedItem="{Binding Path=SelectedConnectionInfo}" IsEnabled="{Binding Path=IsConnectionSelectionEnabled}">
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
-                            <ui:ConnectionInfoComponent ConnectionInfo="{Binding Path=.}" TextFontWeight="Normal" ImageMargin="0" TextAndIconVerticalAlignment="Center"/>
+                            <ui:ConnectionInfoComponent ConnectionInfo="{Binding Path=.}" TextFontWeight="Normal" ImageMargin="0" TextAndIconVerticalAlignment="Center"
+                                                        MaxWidth="{Binding ElementName=ConnectionsComboBox, Path=ActualWidth, UpdateSourceTrigger=PropertyChanged}"/>
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>

From 888dab89b102ae5cfc164be3d62cfdeeefad5271 Mon Sep 17 00:00:00 2001
From: Gabriela Trutan <gabriela.trutan@sonarsource.com>
Date: Fri, 27 Dec 2024 18:11:40 +0100
Subject: [PATCH 3/3] SLVS-1651 Fix connection name vizualization for longer
 names in the Listbox from Manage Connections dialog

---
 .../UI/ManageConnections/ManageConnectionsDialog.xaml        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml
index a3be35e09..79f30ed0a 100644
--- a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml
+++ b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml
@@ -56,7 +56,8 @@
                         Click="NewConnection_Clicked" />
             </Grid>
             <ListBox Grid.Row="1" ItemsSource="{Binding Path=ConnectionViewModels, Mode=OneWay}" Margin="0,10"
-                     ItemContainerStyle="{StaticResource NoSelectionListBoxItemStyle}">
+                     ItemContainerStyle="{StaticResource NoSelectionListBoxItemStyle}"
+                     ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <Grid Margin="0,5,0,0">
@@ -90,7 +91,7 @@
                                 </Grid.RowDefinitions>
 
                                 <TextBlock Grid.Row="0" Grid.RowSpan="2" Text="{Binding Path=Name, Mode=OneWay}"
-                                           VerticalAlignment="Center" />
+                                           VerticalAlignment="Center" TextWrapping="Wrap" />
                                 <CheckBox Visibility="Collapsed" Grid.Row="1"
                                           Content="{x:Static res:UiResources.SmartNotificationsCheckboxLabel}"
                                           IsChecked="{Binding Path=EnableSmartNotifications}"