Browse Source

Fix ternary operator formatting, add config entry to the .editorconfig.

pull/2347/head
Dariusz Komosinski 8 years ago
parent
commit
5822e60db6
  1. 3
      .editorconfig
  2. 12
      src/Avalonia.Controls/TreeView.cs

3
.editorconfig

@ -132,6 +132,9 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false csharp_space_between_square_brackets = false
# Wrapping preferences
csharp_wrap_before_ternary_opsigns = false
# Xaml files # Xaml files
[*.xaml] [*.xaml]
indent_size = 4 indent_size = 4

12
src/Avalonia.Controls/TreeView.cs

@ -340,9 +340,9 @@ namespace Avalonia.Controls
{ {
if (!this.IsVisualAncestorOf(element)) if (!this.IsVisualAncestorOf(element))
{ {
IControl result = _selectedItem != null IControl result = _selectedItem != null ?
? ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) ItemContainerGenerator.Index.ContainerFromItem(_selectedItem) :
: ItemContainerGenerator.ContainerFromIndex(0); ItemContainerGenerator.ContainerFromIndex(0);
return (true, result); return (true, result);
} }
@ -426,9 +426,9 @@ namespace Avalonia.Controls
if (index > 0) if (index > 0)
{ {
var previous = (TreeViewItem)parentGenerator.ContainerFromIndex(index - 1); var previous = (TreeViewItem)parentGenerator.ContainerFromIndex(index - 1);
result = previous.IsExpanded result = previous.IsExpanded ?
? (TreeViewItem)previous.ItemContainerGenerator.ContainerFromIndex(previous.ItemCount - 1) (TreeViewItem)previous.ItemContainerGenerator.ContainerFromIndex(previous.ItemCount - 1) :
: previous; previous;
} }
else else
{ {

Loading…
Cancel
Save