优化修改菜单名样式
This commit is contained in:
@@ -44,13 +44,24 @@
|
|||||||
</BeginStoryboard>
|
</BeginStoryboard>
|
||||||
</MultiTrigger.ExitActions>
|
</MultiTrigger.ExitActions>
|
||||||
</MultiTrigger>
|
</MultiTrigger>
|
||||||
<!--<Trigger Property="IsMouseOver" Value="True">
|
|
||||||
<Setter Property="Background" Value="#FFE4DBDB"/>
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
</Trigger>-->
|
<Setter Property="Background" Value="#FFECECEC"/>
|
||||||
<Trigger Property="IsSelected" Value="true">
|
</Trigger>
|
||||||
|
<Trigger Property="IsSelected" Value="True">
|
||||||
<Setter Property="Background" Value="#FFECECEC"/>
|
<Setter Property="Background" Value="#FFECECEC"/>
|
||||||
<Setter Property="Foreground" Value="Black"/>
|
<Setter Property="Foreground" Value="Black"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
|
|
||||||
|
<MultiDataTrigger>
|
||||||
|
<MultiDataTrigger.Conditions>
|
||||||
|
<Condition Binding="{Binding IsEdit}" Value="True"/>
|
||||||
|
</MultiDataTrigger.Conditions>
|
||||||
|
<MultiDataTrigger.Setters>
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
</MultiDataTrigger.Setters>
|
||||||
|
</MultiDataTrigger>
|
||||||
|
|
||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
<cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
|
<cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
|
||||||
@@ -111,17 +122,18 @@
|
|||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<StackPanel MouseLeftButtonDown="MenuClick" MouseRightButtonDown="MenuClick" Tag="{Binding}">
|
<StackPanel MouseLeftButtonDown="MenuClick" MouseRightButtonDown="MenuClick" Tag="{Binding}">
|
||||||
<hc:TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
|
<TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"
|
Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"
|
||||||
FontSize="16"
|
FontSize="16"
|
||||||
Height="25"
|
Height="28"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
TextAlignment="Left"
|
TextAlignment="Left"
|
||||||
LostFocus="LostFocusOrEnterDown"
|
LostFocus="LostFocusOrEnterDown"
|
||||||
KeyDown="LostFocusOrEnterDown"
|
KeyDown="LostFocusOrEnterDown"
|
||||||
Tag="{Binding}"
|
Tag="{Binding}"
|
||||||
Margin="2"
|
Padding="2"
|
||||||
|
BorderThickness="0"
|
||||||
IsVisibleChanged="MenuEditWhenVisibilityChanged"
|
IsVisibleChanged="MenuEditWhenVisibilityChanged"
|
||||||
Visibility="{Binding MenuEdit}"/>
|
Visibility="{Binding MenuEdit}"/>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
|
|||||||
@@ -17,11 +17,23 @@ namespace GeekDesk.ViewModel
|
|||||||
private string menuId;
|
private string menuId;
|
||||||
private Visibility menuEdit = Visibility.Collapsed;
|
private Visibility menuEdit = Visibility.Collapsed;
|
||||||
private Visibility notMenuEdit = Visibility.Visible;
|
private Visibility notMenuEdit = Visibility.Visible;
|
||||||
|
private bool isEdit = false;
|
||||||
private string menuGeometry; //菜单几何图标
|
private string menuGeometry; //菜单几何图标
|
||||||
private string geometryColor; //几何图标颜色
|
private string geometryColor; //几何图标颜色
|
||||||
private ObservableCollection<IconInfo> iconList = new ObservableCollection<IconInfo>();
|
private ObservableCollection<IconInfo> iconList = new ObservableCollection<IconInfo>();
|
||||||
|
|
||||||
|
public bool IsEdit
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return isEdit;
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
isEdit = value;
|
||||||
|
OnPropertyChanged("IsEdit");
|
||||||
|
}
|
||||||
|
}
|
||||||
public string MenuGeometry
|
public string MenuGeometry
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -93,9 +105,11 @@ namespace GeekDesk.ViewModel
|
|||||||
menuEdit = value;
|
menuEdit = value;
|
||||||
if (menuEdit == Visibility.Visible)
|
if (menuEdit == Visibility.Visible)
|
||||||
{
|
{
|
||||||
|
IsEdit = true;
|
||||||
NotMenuEdit = Visibility.Collapsed;
|
NotMenuEdit = Visibility.Collapsed;
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
|
IsEdit = false;
|
||||||
NotMenuEdit = Visibility.Visible;
|
NotMenuEdit = Visibility.Visible;
|
||||||
}
|
}
|
||||||
OnPropertyChanged("MenuEdit");
|
OnPropertyChanged("MenuEdit");
|
||||||
|
|||||||
Reference in New Issue
Block a user