Skip to content

Commit 0750c66

Browse files
committed
2 parents afbfacf + bcfdbfc commit 0750c66

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

MaterialDesignThemes.Wpf/Themes/Generic.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,10 +617,10 @@
617617
TextElement.FontSize="13"
618618
TextOptions.TextFormattingMode="Ideal"
619619
TextOptions.TextRenderingMode="Auto"
620-
FocusManager.IsFocusScope="True"
620+
FocusManager.IsFocusScope="False"
621621
Foreground="{DynamicResource MaterialDesignBody}"
622622
FontFamily="{StaticResource MaterialDesignFont}"
623-
Focusable="False"
623+
Focusable="True"
624624
IsTabStop="False"
625625
Opacity="0"
626626
RenderTransformOrigin=".5,.5"

MaterialDesignThemes.Wpf/Transitions/IndexedItemOffsetMultiplierExtension.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,15 @@ public override object ProvideValue(IServiceProvider serviceProvider)
6868
multiplier = itemsControl.Items.IndexOf(element);
6969
}
7070

71+
if (multiplier == -1) //still not found, repeat now using datacontext
72+
{
73+
var frameworkElement = element as FrameworkElement;
74+
if (frameworkElement != null)
75+
{
76+
multiplier = itemsControl.Items.IndexOf(frameworkElement.DataContext);
77+
}
78+
}
79+
7180
return multiplier > -1 ? new TimeSpan(Unit.Ticks * multiplier) : TimeSpan.Zero;
7281
}
7382
}

0 commit comments

Comments
 (0)