Skip to content

sync with main repo #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 17, 2016
Merged

sync with main repo #178

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fbc5d1
Add scrollbar to Todo Settings, closes #2225
comintern Dec 15, 2016
04140e2
Merge branch 'next' of https://github.com/comintern/Rubberduck.git
comintern Dec 15, 2016
0d5c984
Merge branch 'next' into next
comintern Dec 17, 2016
a7898d5
Merge pull request #2433 from retailcoder/next
retailcoder Dec 17, 2016
4fefe73
Merge branch 'next' into next
comintern Dec 17, 2016
1e81fa5
Merge pull request #2434 from comintern/next
retailcoder Dec 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 39 additions & 30 deletions RetailCoder.VBE/UI/Settings/TodoSettings.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@
</Style>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<StackPanel Margin="5,5,5,0">
<Label Background="DarkGray"
HorizontalContentAlignment="Stretch"
Expand Down Expand Up @@ -311,39 +316,43 @@
</Button>
</ToolBar>
</ToolBarTray>
<DataGrid Name="TodoMarkerGrid"
ItemsSource="{Binding TodoSettings}"
AutoGenerateColumns="False"
CanUserReorderColumns="False"
IsReadOnly="False"
SelectionMode="Single"
CanUserAddRows="False"
HorizontalGridLinesBrush="Transparent"
VerticalGridLinesBrush="Transparent"
HeadersVisibility="Column"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ItemContainerStyle="{StaticResource PrettifyRow}"
ColumnHeaderHeight="22"
BorderThickness="0"
CellEditEnding="TodoMarkerGrid_CellEditEnding">
<DataGrid.InputBindings>
<KeyBinding Key="Delete"
</StackPanel>
<DataGrid Name="TodoMarkerGrid"
Grid.Row="1"
Margin="5,0,5,5"
ItemsSource="{Binding TodoSettings}"
AutoGenerateColumns="False"
CanUserReorderColumns="False"
IsReadOnly="False"
SelectionMode="Single"
CanUserAddRows="False"
HorizontalGridLinesBrush="Transparent"
VerticalGridLinesBrush="Transparent"
HeadersVisibility="Column"
ScrollViewer.CanContentScroll="True"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ItemContainerStyle="{StaticResource PrettifyRow}"
ColumnHeaderHeight="22"
BorderThickness="0"
CellEditEnding="TodoMarkerGrid_CellEditEnding">
<DataGrid.InputBindings>
<KeyBinding Key="Delete"
Command="{Binding DeleteTodoCommand}"
CommandParameter="{Binding ElementName=TodoMarkerGrid, Path=SelectedItem}" />
</DataGrid.InputBindings>
<DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TodoSettings_TextLabel}"
</DataGrid.InputBindings>
<DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="Transparent" />
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TodoSettings_TextLabel}"
Width="*"
Binding="{Binding Text}" />
</DataGrid.Columns>
</DataGrid>
</StackPanel>
</DataGrid.Columns>
</DataGrid>
</Grid>
</UserControl>