Bladeren bron

调节粗细控件-单位

liyijie 1 jaar geleden
bovenliggende
commit
ef557b72a2

+ 12 - 5
PDF Office/CustomControl/CompositeControl/CustomComboControl.xaml.cs

@@ -1,5 +1,7 @@
-using System;
+using Microsoft.Office.Interop.Word;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -153,6 +155,7 @@ namespace PDF_Master.CustomControl.CompositeControl
             if (item != null)
             {
                 title.Text = item.Content;
+                Trace.WriteLine("comBox_SelectionChanged" + title.Text);
                 SelectedIndex = comBox.SelectedIndex;
 
                 if (IsValueContent == false)
@@ -306,6 +309,7 @@ namespace PDF_Master.CustomControl.CompositeControl
                         else
                         {
                             control.Value = selectedItems.Value;
+                            Trace.WriteLine("SelectedItemsPropertyChangedValue" + control.Value);
                         }
                         control.title.Text = selectedItems.Content;
                     }
@@ -328,10 +332,13 @@ namespace PDF_Master.CustomControl.CompositeControl
 
                         if (index >= 0)
                         {
-                            if (control.SelectedIndex != index)
-                            {
-                                control.SelectedIndex = index;
-                            }
+
+                            //为了改变值时选项跟着改变,但是值并没有时时刻刻改变,且影响其他事件展示注释掉 2023/4/4
+                            //if (control.SelectedIndex != index)
+                            //{
+                            //    control.SelectedIndex = index;
+                            //    Trace.WriteLine("SelectedItemsPropertyChanged" + index);
+                            //}
                             //control.SelectedIndex = -1;
                             //control.SelectedIndex = index;
                         }

+ 1 - 1
PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml

@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="usercontrol"
-    d:DesignHeight="64"
+    d:DesignHeight="80"
     d:DesignWidth="228"
     Loaded="UserControl_Loaded"
     mc:Ignorable="d">

+ 17 - 12
PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml.cs

@@ -1,6 +1,8 @@
-using Prism.Commands;
+using Microsoft.Office.Interop.Word;
+using Prism.Commands;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -90,7 +92,7 @@ namespace PDF_Master.CustomControl.CompositeControl
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            ThicknessSlider.ValueChanged += ThicknessSlider_ValueChanged;
+            //ThicknessSlider.ValueChanged += ThicknessSlider_ValueChanged;
             combox.ValueChanged -= combox_ValueChanged;
             combox.ValueChanged += combox_ValueChanged;
         }
@@ -101,18 +103,20 @@ namespace PDF_Master.CustomControl.CompositeControl
             {
                 //点击下拉框时触发
                 if (combox.IsExistInComBox(sender))
-                {
+                {
+                    Trace.WriteLine("combox_ValueChanged" + (double)sender);
                     ThicknessSlider.Value = (double)sender;
+                    
                     ValueChanged?.Invoke((double)sender, null);
                 }
             }
         }
-
-        private void ThicknessSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            combox.SelectedItems = new ComboDataItem(Value);
-          //  ValueChanged?.Invoke(Value, null);
-        }
+        //事件重复SelectedValuePropertyChanged 2023/4/4
+        //private void ThicknessSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        //{
+        //    combox.SelectedItems = new ComboDataItem(Value);
+        //  //  ValueChanged?.Invoke(Value, null);
+        //}
 
 
         public double Value
@@ -127,9 +131,10 @@ namespace PDF_Master.CustomControl.CompositeControl
             var control = d as SlidComboControl;
             var value = (double)e.NewValue;
             if (control != null)
-            {
-                control.combox.SelectedItems = new ComboDataItem(value);
-
+            {
+                Trace.WriteLine("SelectedValuePropertyChanged" + value);
+                control.combox.SelectedItems = new ComboDataItem(value,"pt");
+                
             }
         }