Skip to content

Commit

Permalink
Fix: Search issue when double-clicking search textbox
Browse files Browse the repository at this point in the history
  • Loading branch information
rzander committed Aug 21, 2019
1 parent e08e872 commit dc445fe
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion RZ4CM/InstallSwPanel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Margin="5,0,0,0">
<StackPanel Orientation="Horizontal" >
<TextBox x:Name="tbSearch" DockPanel.Dock="Right" Height="24" Width="150" Text="Search..." Foreground="#FFAEACAC" Tag="Search" GotFocus="tbSearch_GotFocus" LostFocus="tbSearch_LostFocus" KeyDown="tbSearch_KeyDown" MouseDoubleClick="tbSearch_MouseDoubleClick"/>
<TextBox x:Name="tbSearch" DockPanel.Dock="Right" Height="24" Width="150" Text="Search..." Foreground="#FFAEACAC" Tag="Search" GotFocus="tbSearch_GotFocus" LostFocus="tbSearch_LostFocus" KeyDown="tbSearch_KeyDown"/>
<Image Width="24" Height="24" Source="Images/Search_24.png" Margin="1,0,0,0" />
</StackPanel>
<StackPanel x:Name="spSupport" Orientation="Horizontal" HorizontalAlignment="Right" Background="{x:Null}">
Expand Down
8 changes: 0 additions & 8 deletions RZ4CM/InstallSwPanel.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -514,14 +514,6 @@ private void miOpenFolders_Click(object sender, RoutedEventArgs e)
}
}

private void tbSearch_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
tSearch.Stop();
lAllSoftware = RZRestAPIv2.GetCatalog().Distinct().OrderBy(t => t.ShortName).ThenByDescending(t => t.ProductVersion).ThenByDescending(t => t.ProductName).Select(x => new GetSoftware() { isInstalled = false }).ToList();
//Mark all installed...
lAllSoftware.ToList().ForEach(x => { if (lSoftware.FirstOrDefault(t => (t.ProductName == x.ProductName && t.ProductVersion == x.ProductVersion)) != null) { x.isInstalled = true; } });
}

private void miInstall_Click(object sender, RoutedEventArgs e)
{
tSearch.Stop();
Expand Down
2 changes: 1 addition & 1 deletion RZ4CM/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.0.*")]
[assembly: AssemblyFileVersion("1.7.0.4")]
[assembly: AssemblyFileVersion("1.7.0.5")]

0 comments on commit dc445fe

Please sign in to comment.