Pārlūkot izejas kodu

mxg:修改水平滚动条位置

mengxiangge 5 gadi atpakaļ
vecāks
revīzija
23d5c8a060

+ 2 - 1
FirmLib/Com.FirmLib.UI/Insuer/WinInsuerBaseInfo.xaml

@@ -9,7 +9,8 @@
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
-                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="保险商名称" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="保险商名称" Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Insuer/WinInsuerProjectInfo.xaml

@@ -12,7 +12,8 @@
              xmlns:insuer="clr-namespace:Com.FirmLib.UI.Insuer"
              xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500"  Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerBaseInfo.xaml

@@ -10,7 +10,8 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" Title="维修商名称" Name="this"
-             d:DesignHeight="300" d:DesignWidth="500"  Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500"  
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Maintainer/WinMaintainerInfo.xaml

@@ -9,7 +9,8 @@
                    xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
                    xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
                    mc:Ignorable="d" Title="维修商信息"
-             d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500" Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Maintainer/WinManitainerProjectInfo.xaml

@@ -11,7 +11,8 @@
              xmlns:maintainer="clr-namespace:Com.FirmLib.UI.Maintainer"
              xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500"  Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Manufacturer/WinManufactureBaseInfo.xaml

@@ -9,7 +9,8 @@
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
-                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家名称" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家名称" Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Manufacturer/WinManufactureInfo.xaml

@@ -10,7 +10,8 @@
              xmlns:wpf="clr-namespace:FWindSoft.Wpf;assembly=FWindSoft.Wpf"
                   xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
-                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+                 mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="生产厂家" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 2 - 1
FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml

@@ -8,7 +8,8 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
-             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="[品牌名-产品名]型号" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="[品牌名-产品名]型号" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <fw:BindingProxy x:Key="DATA" Data="{Binding}"></fw:BindingProxy>

+ 3 - 1
FirmLib/Com.FirmLib.UI/Manufacturer/WinProjectAssetList.xaml

@@ -8,7 +8,9 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
              xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
-             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="项目资产清单" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="500" Title="项目资产清单" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
+
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <fw:BindingProxy x:Key="DATA" Data="{Binding}"></fw:BindingProxy>

+ 3 - 1
FirmLib/Com.FirmLib.UI/Seller/WinSellerBaseInfo.xaml

@@ -10,7 +10,9 @@
              xmlns:behaviors="clr-namespace:FWindSoft.Wpf.Behaviors;assembly=FWindSoft.Wpf"
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" Title="供应商名称"
-             d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500" Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
+
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 3 - 1
FirmLib/Com.FirmLib.UI/Seller/WinSellerInfo.xaml

@@ -9,7 +9,9 @@
                  xmlns:bllCommon="clr-namespace:Com.FirmLib.UI.BllCommon"
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" Title="供应商信息"
-             d:DesignHeight="300" d:DesignWidth="500" Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500" Name="this" 
+                 Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}" >
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>

+ 3 - 1
FirmLib/Com.FirmLib.UI/Seller/WinSellerProjectInfo.xaml

@@ -11,7 +11,9 @@
              xmlns:ui="clr-namespace:Com.FirmLib.UI"
              xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="500"  Name="this" Height="{Binding Height,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UIElement}}"
+             d:DesignHeight="300" d:DesignWidth="500"  Name="this" 
+                 Height="{Binding ActualHeight,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}"
+
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <wpf:BindingProxy x:Key="DATA" Data="{Binding}"></wpf:BindingProxy>