样式调整

VIZ.Package.Module.Resource/Style/IconButton/IconButton_Default.xaml

@@ -92,15 +92,19 @@
         <Setter Property="BorderThickness" Value="0"></Setter>
         <Setter Property="Height" Value="20"></Setter>
         <Setter Property="Width" Value="20"></Setter>
+        <Setter Property="IconWidth" Value="20"></Setter>
+        <Setter Property="IconHeight" Value="20"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="fcommon:IconButton">
                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
                             Background="{TemplateBinding Background}">
                         <Grid x:Name="content" Opacity="1">
-                            <Image x:Name="img" Width="20" Height="20" Visibility="Visible"
+                            <Image x:Name="img" Visibility="Visible"
+                                   Width="{TemplateBinding IconWidth}" Height="{TemplateBinding IconHeight}"
                                    Source="{TemplateBinding Icon}"></Image>
-                            <Image x:Name="img_hover" Width="20" Height="20" Visibility="Collapsed"
+                            <Image x:Name="img_hover" Visibility="Collapsed"
+                                   Width="{TemplateBinding IconWidth}" Height="{TemplateBinding IconHeight}"
                                    Source="{TemplateBinding IconHover}"></Image>
                         </Grid>
                     </Border>

VIZ.Package.Module/ControlObject/FieldEdit/View/FieldEditView.xaml

@@ -21,7 +21,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="25"></RowDefinition>
-            <RowDefinition Height="30"></RowDefinition>
+            <RowDefinition Height="35"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
         <!-- 描述 -->
@@ -44,13 +44,15 @@
                 <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_save_30x30.png"
                                     IconHover="/VIZ.Package.Module.Resource;component/Icons/icon_save_hover_30x30.png"
                                     Style="{StaticResource IconButton_Menu}"
-                                    ToolTip="保存" Margin="5,0,0,0" IconWidth="24" IconHeight="24"
+                                    ToolTip="保存" Margin="5,0,0,0" 
+                                    IconWidth="24" IconHeight="24" Width="24" Height="24"
                                     Command="{Binding SaveCommand}"></fcommon:IconButton>
                 <!-- 另存为 -->
                 <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_save_as_30x30.png"
                                     IconHover="/VIZ.Package.Module.Resource;component/Icons/icon_save_as_hover_30x30.png"
                                     Style="{StaticResource IconButton_Menu}"
-                                    ToolTip="另存为" Margin="5,0,0,0" IconWidth="24" IconHeight="24"
+                                    ToolTip="另存为" Margin="5,0,0,0" 
+                                    IconWidth="24" IconHeight="24" Width="24" Height="24"
                                     Command="{Binding SaveAsCommand}"></fcommon:IconButton>
             </StackPanel>
         </Border>

VIZ.Package.Module/Main/View/MainTopView.xaml

@@ -38,11 +38,11 @@
         <dxb:MainMenuControl Caption="MainMenu" VerticalAlignment="Center" Margin="10,0,0,0">
             <dxb:MainMenuControl.Resources>
                 <Style TargetType="dxb:BarSubItem">
-                    <Setter Property="Margin" Value="0,0,5,0"></Setter>
+                    <Setter Property="Margin" Value="0,0,3,0"></Setter>
                     <Setter Property="ContentTemplate">
                         <Setter.Value>
                             <DataTemplate>
-                                <TextBlock Text="{Binding .}" FontSize="15"></TextBlock>
+                                <TextBlock Text="{Binding .}" FontSize="14"></TextBlock>
                             </DataTemplate>
                         </Setter.Value>
                     </Setter>

VIZ.Package.Module/Main/View/MainView.xaml

@@ -31,14 +31,7 @@
         <Style TargetType="{x:Type dxdo:LayoutPanel}">
             <Setter Property="FloatOnDoubleClick" Value="False"></Setter>
             <Setter Property="BindableName" Value="{Binding ID}" />
-            <!--<Setter Property="Caption" Value="{Binding Name}" />-->
-            <Setter Property="CaptionTemplate">
-                <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Path=Name}" FontSize="15"></TextBlock>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
+            <Setter Property="Caption" Value="{Binding Name}" />
             <Setter Property="MinHeight" Value="60"></Setter>
             <Setter Property="ShowCloseButton" Value="True"></Setter>
             <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>
@@ -46,13 +39,7 @@
         <Style TargetType="{x:Type dxdo:DocumentPanel}">
             <Setter Property="FloatOnDoubleClick" Value="False"></Setter>
             <Setter Property="BindableName" Value="{Binding ID}" />
-            <Setter Property="CaptionTemplate">
-                <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Path=Name}" FontSize="15"></TextBlock>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
+            <Setter Property="Caption" Value="{Binding Name}" />
             <Setter Property="MinHeight" Value="40"></Setter>
             <Setter Property="ShowCloseButton" Value="True"></Setter>
             <Setter Property="Closed" Value="{Binding Path=IsClosed,Mode=TwoWay}"></Setter>

VIZ.Package.Module/Setting/Core/View/SettingWindow.xaml

@@ -18,7 +18,7 @@
         <dxmvvm:EventToCommand EventName="Loaded" Command="{Binding Path=LoadedCommand}"></dxmvvm:EventToCommand>
     </dxmvvm:Interaction.Behaviors>
 
-    <Grid>
+    <Grid Margin="0,5,0,0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="200"></ColumnDefinition>
             <ColumnDefinition Width="*"></ColumnDefinition>
@@ -28,9 +28,9 @@
             <RowDefinition Height="60"></RowDefinition>
         </Grid.RowDefinitions>
         <!-- 设置项 -->
-        <GroupBox Header="设置" Margin="10" Padding="10">
+        <GroupBox Header="设置" Margin="5" Padding="5">
             <ListBox ItemsSource="{Binding Path=ItemsSource}" Margin="0,0,6,0" Background="Transparent"
-                     SelectedValue="{Binding Path=SelectedValue,Mode=TwoWay}">
+                     SelectedValue="{Binding Path=SelectedValue,Mode=TwoWay}" BorderThickness="0">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <Grid Height="30" Margin="5" Background="Transparent">