Skip to content

Commit e3d9da4

Browse files
committed
Check we are working with the correct DataGrid. fixes #477
1 parent 8993c98 commit e3d9da4

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

MainDemo.Wpf/ProvingGround.xaml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,29 @@
2121
-->
2222
</ResourceDictionary.MergedDictionaries>
2323

24-
2524

26-
25+
26+
2727

2828
</ResourceDictionary>
2929
</UserControl.Resources>
3030

31-
<Grid>
32-
<Expander Header="This is My Header" IsExpanded="True" HorizontalContentAlignment="Center">
33-
<TextBlock>Hello World</TextBlock>
34-
</Expander>
35-
</Grid>
31+
<materialDesign:DialogHost Identifier="RootDialog">
32+
<ScrollViewer VerticalScrollBarVisibility="Auto" Background="White">
33+
<Grid>
34+
<TextBox x:Name="loginText"
35+
materialDesign:HintAssist.FloatingScale=".56"
36+
materialDesign:HintAssist.FloatingOffset="1,-42"
37+
Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0" Margin="0,350,0,0" materialDesign:HintAssist.IsFloating="True" HorizontalAlignment="Center" VerticalAlignment="Top" Width="400" FontSize="36" Height="100" Background="White" Padding="6,0,0,2">
38+
<materialDesign:HintAssist.Hint>
39+
<StackPanel Orientation="Horizontal" Margin="0 0 0 0">
40+
<materialDesign:PackIcon Kind="Account" Width="50" Height="50" />
41+
<TextBlock Padding="5,0,0,0">Enter login</TextBlock>
42+
</StackPanel>
43+
</materialDesign:HintAssist.Hint>
44+
</TextBox>
45+
</Grid>
46+
</ScrollViewer>
47+
</materialDesign:DialogHost>
3648

3749
</UserControl>

MaterialDesignThemes.Wpf/DataGridAssist.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Linq;
23
using System.Windows;
34
using System.Windows.Controls;
45
using System.Windows.Controls.Primitives;
@@ -160,8 +161,8 @@ private static void DataGridOnPreviewMouseLeftButtonDown(object sender,
160161

161162
while (inputHitTest != null)
162163
{
163-
var dataGridCell = inputHitTest as DataGridCell;
164-
if (dataGridCell != null)
164+
var dataGridCell = inputHitTest as DataGridCell;
165+
if (dataGridCell != null && dataGrid.Equals(dataGridCell.GetVisualAncestry().OfType<DataGrid>().FirstOrDefault()))
165166
{
166167
ToggleButton toggleButton;
167168
ComboBox comboBox;

0 commit comments

Comments
 (0)