瀏覽代碼

Close doc tab focusable and reverted aspect ratio fix

flabbet 3 年之前
父節點
當前提交
3a90156646
共有 2 個文件被更改,包括 4 次插入10 次删除
  1. 3 2
      PixiEditor/Styles/AvalonDock/Themes/Generic.xaml
  2. 1 8
      PixiEditor/Views/UserControls/SizePicker.xaml.cs

+ 3 - 2
PixiEditor/Styles/AvalonDock/Themes/Generic.xaml

@@ -162,8 +162,9 @@
 	<Style x:Key="PixiEditorDockThemeButtonStyle" TargetType="Button">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Padding" Value="0" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="0" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="Button">

+ 1 - 8
PixiEditor/Views/UserControls/SizePicker.xaml.cs

@@ -13,7 +13,7 @@ namespace PixiEditor.Views
             DependencyProperty.Register(nameof(EditingEnabled), typeof(bool), typeof(SizePicker), new PropertyMetadata(true));
 
         public static readonly DependencyProperty PreserveAspectRatioProperty =
-            DependencyProperty.Register(nameof(PreserveAspectRatio), typeof(bool), typeof(SizePicker), new PropertyMetadata(true, OnPreserveAspectRatioChanged));
+            DependencyProperty.Register(nameof(PreserveAspectRatio), typeof(bool), typeof(SizePicker), new PropertyMetadata(true));
 
         public static readonly DependencyProperty ChosenWidthProperty =
             DependencyProperty.Register(nameof(ChosenWidth), typeof(int), typeof(SizePicker), new PropertyMetadata(1));
@@ -98,13 +98,6 @@ namespace PixiEditor.Views
             WidthPicker.FocusAndSelect();
         }
 
-
-        private static void OnPreserveAspectRatioChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            SizePicker picker = (SizePicker)d;
-            picker.initSize = new System.Drawing.Size(picker.ChosenWidth, picker.ChosenHeight);
-        }
-
         private void AfterLoaded(object parameter)
         {
             initSize = new System.Drawing.Size(ChosenWidth, ChosenHeight);