Browse Source

Merge branch 'master' of http://dev.dp.sagacloud.cn:8886/r/Revit/SAGA.MBI

mengxiangge 6 years ago
parent
commit
1ec4fb2173

BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.dll


BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.pdb


BIN
MBI/Dlls/FirmLibDll/FWindSoft.pdb


+ 2 - 0
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/VmBrandEditor.cs

@@ -42,6 +42,8 @@ namespace Com.FirmLib.UI.Manufacturer
         private void Init()
         {
             LogoKey = new NameValueItem<string>();
+            //为空可能引发遮罩异常
+            ImageBrush = new ImageBrush();
         }
         public void Init(LoadParameter parameter)
         {

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinBrandEditor.xaml

@@ -33,7 +33,7 @@
             </TextBox>
           
             <Label  Content="LOGO:"></Label>
-            <Border Height="100" Width="100" BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Background="{Binding ImageBrush}"  MouseMove="Border_MouseMove">
+            <Border Height="100" Width="100" BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Background="{Binding ImageBrush}"  MouseMove="Border_MouseMove" MouseLeftButtonDown="Border_MouseLeftButtonDown">
                 <!--<Image Stretch="Uniform" x:Name="image"  >-->
                   
                     <fw:MaskOptions.MaskTemplate>

+ 6 - 0
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinBrandEditor.xaml.cs

@@ -100,5 +100,11 @@ namespace Com.FirmLib.UI.Manufacturer
 
             MaskOptions.SetIsShow(element, true);
         }
+        private void Border_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            var element = sender as Border;
+
+            MaskOptions.SetIsShow(element, true);
+        }
     }
 }