Merge pull request #9 from lucasriechelmann/main

Fixed bug in Rename TextBox not showing the text

Author: joaoribe

src/SQLScriptsExplorer.Addin/Controls/FileExplorerTreeView.xaml

@@ -39,20 +39,26 @@
                             Height="16"
                             Margin="3,0,5,0"
                             Source="{Binding Icon}" />
-                        <local:HighlightTextBlock
-                            HighlightBrush="Khaki"
-                            HighlightPhrase="{Binding Path=HighlightPhrase, Mode=TwoWay}"
-                            IsCaseSensitive="False"
-                            IsHitTestVisible="False"
-                            Text="{Binding Path=FileName}" />
-                        <TextBox
-                            x:Name="txtRename"
-                            Width="Auto"
-                            HorizontalAlignment="Center"
-                            KeyDown="txtRename_KeyDown"
-                            LostFocus="txtRename_LostFocus"
-                            Text="{Binding FileName, Mode=TwoWay}"
-                            Visibility="Collapsed" />
+                        <Grid>
+                            <local:HighlightTextBlock
+                                Grid.Row="0"
+                                HighlightBrush="Khaki"
+                                HighlightPhrase="{Binding Path=HighlightPhrase, Mode=TwoWay}"
+                                IsCaseSensitive="False"
+                                IsHitTestVisible="False"
+                                Text="{Binding Path=FileName}" />
+                            <TextBox
+                                x:Name="txtRename"
+                                Grid.Row="0"
+                                Width="Auto"
+                                Height="Auto"
+                                Padding="0"
+                                HorizontalAlignment="Center"
+                                KeyDown="txtRename_KeyDown"
+                                LostFocus="txtRename_LostFocus"
+                                Text="{Binding FileName, Mode=TwoWay}"
+                                Visibility="Collapsed" />
+                        </Grid>
                     </StackPanel>
                 </HierarchicalDataTemplate>
 
@@ -257,20 +263,15 @@
                                         <Setter TargetName="PART_Header" Property="MinHeight" Value="19" />
                                     </MultiTrigger>
                                     <Trigger Property="IsSelected" Value="true">
-                                        <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                                        <Setter TargetName="Bd" Property="Background" Value="#45b3e0" />
                                     </Trigger>
                                     <MultiTrigger>
                                         <MultiTrigger.Conditions>
                                             <Condition Property="IsSelected" Value="true" />
                                             <Condition Property="IsSelectionActive" Value="false" />
                                         </MultiTrigger.Conditions>
-                                        <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                        <Setter TargetName="Bd" Property="Background" Value="#45b3e0" />
                                     </MultiTrigger>
-                                    <Trigger Property="IsEnabled" Value="false">
-                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                                    </Trigger>
                                 </ControlTemplate.Triggers>
                             </ControlTemplate>
                         </Setter.Value>

src/SQLScriptsExplorer.Addin/Controls/HighlightTextBlock.cs

@@ -73,7 +73,8 @@ void ApplyThemeColors()
             DrawingColor foreground = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowTextColorKey);
             DrawingColor background = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundColorKey);
             Foreground = new SolidColorBrush(Color.FromArgb(foreground.A, foreground.R, foreground.G, foreground.B));
-            Background = new SolidColorBrush(Color.FromArgb(background.A, background.R, background.G, background.B));
+            //Background = new SolidColorBrush(Color.FromArgb(background.A, background.R, background.G, background.B));
+            Background = Brushes.Transparent; // Keep background transparent to allow highlighting to show through
         }
         void VSColorTheme_Changed(ThemeChangedEventArgs e)
         {

src/SQLScriptsExplorer.Addin/SQLScriptsExplorer.Addin.csproj

@@ -261,6 +261,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmSettings.resx">
       <DependentUpon>frmSettings.cs</DependentUpon>