Skip to content

Commit 6ab2f98

Browse files
unitycoderunitycoder
committed
Recent projects: disable hittest from datagrid header texts (to stop double click launching unity from header) Fixes #106 
1 parent a830670 commit 6ab2f98

File tree

1 file changed

+39
-5
lines changed

1 file changed

+39
-5
lines changed

Diff for: ‎UnityLauncherPro/MainWindow.xaml

+39-5
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@
8181
</DataGrid.CommandBindings>
8282

8383
<DataGrid.Columns>
84-
<DataGridTextColumn x:Name="txtColumnTitle" CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Title}" ClipboardContentBinding="{x:Null}" Header="Project" IsReadOnly="True" Width="150"/>
84+
<DataGridTextColumn Header="Project" x:Name="txtColumnTitle" CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Title}" ClipboardContentBinding="{x:Null}" IsReadOnly="True" Width="150">
85+
<DataGridTextColumn.HeaderTemplate>
86+
<DataTemplate>
87+
<TextBlock Text="Project" IsHitTestVisible="False" />
88+
</DataTemplate>
89+
</DataGridTextColumn.HeaderTemplate>
90+
</DataGridTextColumn>
8591

8692
<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" Width="72">
8793
<DataGridTextColumn.HeaderTemplate>
@@ -101,7 +107,12 @@
101107
</DataGridTextColumn.CellStyle>
102108
</DataGridTextColumn>
103109
<!--CellStyle="{StaticResource NoFocusCellStyle"}-->
104-
<DataGridTextColumn x:Name="txtColumnName" Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" Header="Path" IsReadOnly="True" Width="185">
110+
<DataGridTextColumn Header="Path" x:Name="txtColumnName" Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" IsReadOnly="True" Width="185">
111+
<DataGridTextColumn.HeaderTemplate>
112+
<DataTemplate>
113+
<TextBlock Text="Path" IsHitTestVisible="False" />
114+
</DataTemplate>
115+
</DataGridTextColumn.HeaderTemplate>
105116
<DataGridTextColumn.CellStyle>
106117
<Style TargetType="{x:Type DataGridCell}">
107118
<Style.Triggers>
@@ -113,16 +124,39 @@
113124
</DataGridTextColumn.CellStyle>
114125
</DataGridTextColumn>
115126
<!--<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Modified, StringFormat=\{0:dd/MM/yyyy HH:mm:ss\}}" ClipboardContentBinding="{x:Null}" Header="Modified" IsReadOnly="True" Width="120"/>-->
116-
<DataGridTextColumn Binding="{Binding Modified, Converter={StaticResource lastModifiedConverter}}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Modified" IsReadOnly="True" Width="120"/>
117-
<DataGridTextColumn Binding="{Binding Arguments}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Arguments" IsReadOnly="False" Width="100"/>
118-
<DataGridTextColumn x:Name="txtColumnGitBranch" Binding="{Binding GITBranch}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Branch" IsReadOnly="True" Width="60"/>
127+
<DataGridTextColumn Header="Modified" Binding="{Binding Modified, Converter={StaticResource lastModifiedConverter}}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" IsReadOnly="True" Width="120">
128+
<DataGridTextColumn.HeaderTemplate>
129+
<DataTemplate>
130+
<TextBlock Text="Modified" IsHitTestVisible="False" />
131+
</DataTemplate>
132+
</DataGridTextColumn.HeaderTemplate>
133+
</DataGridTextColumn>
134+
<DataGridTextColumn Header="Arguments" Binding="{Binding Arguments}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" IsReadOnly="False" Width="100">
135+
<DataGridTextColumn.HeaderTemplate>
136+
<DataTemplate>
137+
<TextBlock Text="Arguments" IsHitTestVisible="False" />
138+
</DataTemplate>
139+
</DataGridTextColumn.HeaderTemplate>
140+
</DataGridTextColumn>
141+
<DataGridTextColumn Header="Branch" x:Name="txtColumnGitBranch" Binding="{Binding GITBranch}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" IsReadOnly="True" Width="60">
142+
<DataGridTextColumn.HeaderTemplate>
143+
<DataTemplate>
144+
<TextBlock Text="Branch" IsHitTestVisible="False" />
145+
</DataTemplate>
146+
</DataGridTextColumn.HeaderTemplate>
147+
</DataGridTextColumn>
119148
<!--TODO platform as dropdown?-->
120149
<!--<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding TargetPlatform}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
121150
<!--<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" SelectedItemBinding="{Binding TargetPlatform, NotifyOnSourceUpdated=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
122151
<!--<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
123152
<!--<DataGridComboBoxColumn Header="Platform" IsReadOnly="False" SelectedItemBinding="{Binding TargetPlatform}" ItemsSource="{Binding Source={StaticResource platformEnum}}" />-->
124153

125154
<DataGridTemplateColumn Header="Platform" Width="90">
155+
<DataGridTemplateColumn.HeaderTemplate>
156+
<DataTemplate>
157+
<TextBlock Text="Platform" IsHitTestVisible="False"/>
158+
</DataTemplate>
159+
</DataGridTemplateColumn.HeaderTemplate>
126160
<DataGridTemplateColumn.CellTemplate >
127161
<DataTemplate >
128162
<ComboBox Style="{StaticResource DataGridComboBox}" ItemsSource="{Binding TargetPlatforms}" SelectedValue="{Binding TargetPlatform}" x:Name="cmbPlatformSelection" OverridesDefaultStyle="True" VerticalAlignment="Center" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch" IsEnabled="{Binding ElementName=chkEnablePlatformSelection, Path=IsChecked}" Height="18" Foreground="{DynamicResource ThemeButtonForeground}" DropDownClosed="CmbPlatformSelection_DropDownClosed" MinWidth="80"/>

0 commit comments

Comments
 (0)