Skip to content

Commit b09ee5e

Browse files
committed
Nice cleanup. Closes #925
1 parent f0d4a5a commit b09ee5e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

RetailCoder.VBE/Controls/GroupingGrid/GroupingGrid.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Setter Property="Template">
1212
<Setter.Value>
1313
<ControlTemplate>
14-
<Expander Background="White" Foreground="Black" Header="{Binding Name}" IsExpanded="True">
14+
<Expander Background="WhiteSmoke" Foreground="Black" Header="{Binding Name}" IsExpanded="True">
1515
<ItemsPresenter></ItemsPresenter>
1616
</Expander>
1717
</ControlTemplate>
@@ -23,7 +23,7 @@
2323
<GroupStyle ContainerStyle="{StaticResource GroupHeaderStyle}">
2424
<GroupStyle.Panel>
2525
<ItemsPanelTemplate>
26-
<DataGridRowsPresenter TextBlock.FontWeight="Bold"></DataGridRowsPresenter>
26+
<DataGridRowsPresenter></DataGridRowsPresenter>
2727
</ItemsPanelTemplate>
2828
</GroupStyle.Panel>
2929
</GroupStyle>

RetailCoder.VBE/ToDoItems/ToDoItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ToDoItem
3535
public QualifiedSelection GetSelection() { return _selection; }
3636

3737
public ToDoItem(TodoPriority priority, CommentNode comment)
38-
: this(priority, comment.CommentText, comment.QualifiedSelection)
38+
: this(priority, comment.Comment.Remove(0, 1).Trim(), comment.QualifiedSelection)
3939
{
4040
}
4141

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,16 @@
2525

2626
<Style x:Key="PrettifyRow" TargetType="DataGridRow">
2727
<EventSetter Event="MouseDoubleClick" Handler="GroupingGridItem_MouseDoubleClick" />
28-
<Setter Property="BorderThickness" Value="1.5" />
28+
<Setter Property="BorderThickness" Value="0,.5,0,0" />
29+
<Setter Property="BorderBrush" Value="DarkGray" />
2930
<Setter Property="Height" Value="22" />
3031
<Setter Property="TextBlock.FontWeight" Value="Normal" />
3132
<Style.Triggers>
3233
<Trigger Property="IsSelected" Value="True">
34+
<Setter Property="BorderThickness" Value="1.5" />
3335
<Setter Property="BorderBrush" Value="#adc6e5"/>
36+
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
3437
</Trigger>
35-
<MultiTrigger>
36-
<MultiTrigger.Conditions>
37-
<Condition Property="IsSelected" Value="True"/>
38-
<Condition Property="IsFocused" Value="False"/>
39-
</MultiTrigger.Conditions>
40-
<Setter Property="BorderBrush" Value="LightGray"/>
41-
</MultiTrigger>
4238
</Style.Triggers>
4339
<Style.Resources>
4440
<Style TargetType="Border">
@@ -62,12 +58,14 @@
6258
<controls:GroupingGrid ItemsSource="{Binding ToDos}" AutoGenerateColumns="False"
6359
SelectedItem="{Binding SelectedToDo}" IsExpanded="True"
6460
CanUserReorderColumns="False" IsReadOnly="True"
65-
HorizontalGridLinesBrush="Gray" VerticalGridLinesBrush="Gray"
61+
HorizontalGridLinesBrush="Transparent" VerticalGridLinesBrush="Transparent"
6662
HeadersVisibility="Column" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
6763
ItemContainerStyle="{StaticResource PrettifyRow}">
6864
<DataGrid.CellStyle>
6965
<Style TargetType="DataGridCell">
7066
<Setter Property="BorderThickness" Value="0" />
67+
<Setter Property="VerticalAlignment" Value="Center" />
68+
<Setter Property="Background" Value="Transparent" />
7169
</Style>
7270
</DataGrid.CellStyle>
7371
<DataGrid.Columns>

RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService
2626
}
2727

2828
public ListCollectionView ToDos {
29-
get { return _toDos; }
29+
get
30+
{
31+
return _toDos;
32+
}
3033
set
3134
{
3235
_toDos = value;

0 commit comments

Comments
 (0)