Merge branch 'master' of bitbucket.org:bluetradesys/spark

This commit is contained in:
Taha Afzal committed 2017-12-11 11:30:02 -05:00
commit d1f23ba4e2
3 files changed
+19 -1

No files matched your search

+1 -1
View File
@@ -496,7 +496,7 @@
<Setter Property="ItemTemplate">
<Setter.Value>
<DataTemplate>
<control:SparkMenuItem Content="{Binding title}" Command="{Binding command}" Style="{StaticResource LauncherMenuButton}" Icon="{Binding icon}" />
<control:SparkMenuItem Content="{Binding title}" Command="{Binding command}" Style="{StaticResource LauncherMenuButton}" Icon="{Binding icon}" Collapsed="False"/>
</DataTemplate>
</Setter.Value>
</Setter>
@@ -25,5 +25,19 @@ namespace mbts.ui.controls {
public static readonly DependencyProperty IconProperty =
DependencyProperty.Register("Icon", typeof(ImageSource), typeof(SparkMenuItem), new PropertyMetadata(default(ImageSource)));
public bool Collapsed
{
get { return (bool)GetValue(CollapsedProperty); }
set { SetValue(CollapsedProperty, value); }
}
// Using a DependencyProperty as the backing store for Collapsed. This enables animation, styling, binding, etc...
public static readonly DependencyProperty CollapsedProperty =
DependencyProperty.Register("Collapsed", typeof(bool), typeof(SparkMenuItem), new PropertyMetadata(default(bool)));
}
}
@@ -96,6 +96,10 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Collapsed" Value="True">
<Setter TargetName="button_content" Property="Visibility" Value="Collapsed" />
<Setter TargetName="launcher_button_border" Property="MinWidth" Value="52" />
</Trigger>
<Trigger Property="IsFocused" Value="True">
<Setter TargetName="launcher_button_border" Property="Background" Value="{mbts:BTSColor UI.Button.mouseover_background}" />
<Setter TargetName="menu_item_arrow" Property="Fill" Value="{DynamicResource StartMenuMouseOverBackground}" />