Additional formatting tweaks (#5909)

This commit is contained in:
Clint Rutkas
2020-08-13 15:32:12 -07:00
committed by GitHub
parent 38b0d427f8
commit 23a9fa40e7
15 changed files with 129 additions and 137 deletions

View File

@@ -18,21 +18,18 @@ namespace PowerLauncher.ViewModel
{
public class ResultsViewModel : BaseModel
{
#region Private Fields
private readonly object _collectionLock = new object();
private readonly Settings _settings;
#endregion
public ResultsViewModel()
{
Results = new ResultCollection();
BindingOperations.EnableCollectionSynchronization(Results, _collectionLock);
}
public ResultsViewModel(Settings settings) : this()
public ResultsViewModel(Settings settings)
: this()
{
_settings = settings ?? throw new ArgumentNullException(nameof(settings));
_settings.PropertyChanged += (s, e) =>
@@ -47,8 +44,6 @@ namespace PowerLauncher.ViewModel
};
}
#region Properties
public int MaxHeight
{
get
@@ -63,11 +58,13 @@ namespace PowerLauncher.ViewModel
public ResultViewModel SelectedItem
{
get { return _selectedItem; }
get
{
return _selectedItem;
}
set
{
// value can be null when selecting an item in a virtualized list
if (value != null)
{
if (_selectedItem != null)
@@ -91,10 +88,6 @@ namespace PowerLauncher.ViewModel
public ResultCollection Results { get; }
#endregion
#region Private Methods
private static int InsertIndexOf(int newScore, IList<ResultViewModel> list)
{
int index = 0;
@@ -125,10 +118,6 @@ namespace PowerLauncher.ViewModel
}
}
#endregion
#region Public Methods
public void SelectNextResult()
{
SelectedIndex = NewIndex(SelectedIndex + 1);
@@ -247,9 +236,6 @@ namespace PowerLauncher.ViewModel
Results.AddRange(sorted);
}
#endregion
#region FormattedText Dependency Property
public static readonly DependencyProperty FormattedTextProperty = DependencyProperty.RegisterAttached(
"FormattedText",
typeof(Inline),
@@ -272,16 +258,20 @@ namespace PowerLauncher.ViewModel
private static void FormattedTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var textBlock = d as TextBlock;
if (textBlock == null) return;
if (textBlock == null)
{
return;
}
var inline = (Inline)e.NewValue;
textBlock.Inlines.Clear();
if (inline == null) return;
if (inline == null)
{
return;
}
textBlock.Inlines.Add(inline);
}
#endregion
}
}