Merge branch 'master' into styleCopUpdate

azchohfi · web-flow · commit 385293b6e995 · 2020-03-24T18:01:09.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.cs
@@ -3712,7 +3712,10 @@ protected override void OnPointerWheelChanged(PointerRoutedEventArgs e)
             if (!e.Handled)
             {
                 PointerPoint pointerPoint = e.GetCurrentPoint(this);
-                bool isForHorizontalScroll = pointerPoint.Properties.IsHorizontalMouseWheel;
+
+                // A horizontal scroll happens if the mouse has a horizontal wheel OR if the horizontal scrollbar is not disabled AND the vertical scrollbar IS disabled
+                bool isForHorizontalScroll = pointerPoint.Properties.IsHorizontalMouseWheel ||
+                    (this.HorizontalScrollBarVisibility != ScrollBarVisibility.Disabled && this.VerticalScrollBarVisibility == ScrollBarVisibility.Disabled);
 
                 if ((isForHorizontalScroll && this.HorizontalScrollBarVisibility == ScrollBarVisibility.Disabled) ||
                     (!isForHorizontalScroll && this.VerticalScrollBarVisibility == ScrollBarVisibility.Disabled))
@@ -3721,7 +3724,7 @@ protected override void OnPointerWheelChanged(PointerRoutedEventArgs e)
                 }
 
                 double offsetDelta = -pointerPoint.Properties.MouseWheelDelta / DATAGRID_mouseWheelDeltaDivider;
-                if (isForHorizontalScroll)
+                if (isForHorizontalScroll && pointerPoint.Properties.IsHorizontalMouseWheel)
                 {
                     offsetDelta *= -1.0;
                 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs
@@ -83,11 +83,11 @@ private void CanvasTextBoxBoldButton_Clicked(object sender, RoutedEventArgs e)
             }
         }
 
-        private void CanvasTextBoxItlaicButton_Clicked(object sender, RoutedEventArgs e)
+        private void CanvasTextBoxItalicButton_Clicked(object sender, RoutedEventArgs e)
         {
             if (SelectedTextDrawable != null)
             {
-                _drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItlaicButton.IsChecked ?? false);
+                _drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItalicButton.IsChecked ?? false);
                 _canvasTextBox.UpdateFontStyle(SelectedTextDrawable.IsItalic);
                 ReDrawCanvas();
             }
@@ -154,7 +154,7 @@ private void CanvasTextBox_TextChanged(object sender, string text)
                 text,
                 _canvasTextBoxColorPicker.Color,
                 _canvasTextBoxBoldButton.IsChecked ?? false,
-                _canvasTextBoxItlaicButton.IsChecked ?? false);
+                _canvasTextBoxItalicButton.IsChecked ?? false);
 
             ReDrawCanvas();
             _drawingSurfaceRenderer.UpdateSelectedTextDrawable();
@@ -184,13 +184,13 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg
                     _canvasTextBoxColorPicker.Color = SelectedTextDrawable.TextColor;
                     _canvasTextBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString();
                     _canvasTextBoxBoldButton.IsChecked = SelectedTextDrawable.IsBold;
-                    _canvasTextBoxItlaicButton.IsChecked = SelectedTextDrawable.IsBold;
+                    _canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsItalic;
 
                     return;
                 }
 
                 _canvasTextBox.UpdateFontSize(TextFontSize);
-                _canvasTextBox.UpdateFontStyle(_canvasTextBoxItlaicButton.IsChecked ?? false);
+                _canvasTextBox.UpdateFontStyle(_canvasTextBoxItalicButton.IsChecked ?? false);
                 _canvasTextBox.UpdateFontWeight(_canvasTextBoxBoldButton.IsChecked ?? false);
 
                 _inkCanvas.Visibility = Visibility.Collapsed;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs
@@ -35,7 +35,7 @@ public partial class InfiniteCanvas : Control
         private ColorPicker _canvasTextBoxColorPicker;
 
         private TextBox _canvasTextBoxFontSizeTextBox;
-        private ToggleButton _canvasTextBoxItlaicButton;
+        private ToggleButton _canvasTextBoxItalicButton;
         private ToggleButton _canvasTextBoxBoldButton;
         private Button _undoButton;
         private Button _redoButton;
@@ -166,7 +166,7 @@ protected override void OnApplyTemplate()
             _canvasTextBoxTools = (StackPanel)GetTemplateChild("CanvasTextBoxTools");
             _canvasTextBoxColorPicker = (ColorPicker)GetTemplateChild("CanvasTextBoxColorPicker");
             _canvasTextBoxFontSizeTextBox = (TextBox)GetTemplateChild("CanvasTextBoxFontSizeTextBox");
-            _canvasTextBoxItlaicButton = (ToggleButton)GetTemplateChild("CanvasTextBoxItlaicButton");
+            _canvasTextBoxItalicButton = (ToggleButton)GetTemplateChild("CanvasTextBoxItalicButton");
             _canvasTextBoxBoldButton = (ToggleButton)GetTemplateChild("CanvasTextBoxBoldButton");
             _drawingSurfaceRenderer = (InfiniteCanvasVirtualDrawingSurface)GetTemplateChild("DrawingSurfaceRenderer");
             _mainContainer = (Canvas)GetTemplateChild("MainContainer");
@@ -204,7 +204,7 @@ protected override void OnApplyTemplate()
         private void UnRegisterEvents()
         {
             _canvasTextBoxFontSizeTextBox.TextChanged -= CanvasTextBoxFontSizeTextBox_TextChanged;
-            _canvasTextBoxItlaicButton.Click -= CanvasTextBoxItlaicButton_Clicked;
+            _canvasTextBoxItalicButton.Click -= CanvasTextBoxItalicButton_Clicked;
             _canvasTextBoxBoldButton.Click -= CanvasTextBoxBoldButton_Clicked;
             _canvasTextBoxColorPicker.ColorChanged -= CanvasTextBoxColorPicker_ColorChanged;
             _enableTouchInkingButton.Checked -= EnableTouchInkingButton_Checked;
@@ -228,7 +228,7 @@ private void UnRegisterEvents()
         private void RegisterEvents()
         {
             _canvasTextBoxFontSizeTextBox.TextChanged += CanvasTextBoxFontSizeTextBox_TextChanged;
-            _canvasTextBoxItlaicButton.Click += CanvasTextBoxItlaicButton_Clicked;
+            _canvasTextBoxItalicButton.Click += CanvasTextBoxItalicButton_Clicked;
             _canvasTextBoxBoldButton.Click += CanvasTextBoxBoldButton_Clicked;
             _canvasTextBoxColorPicker.ColorChanged += CanvasTextBoxColorPicker_ColorChanged;
             _enableTouchInkingButton.Checked += EnableTouchInkingButton_Checked;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml
@@ -88,7 +88,7 @@
                                         </ToggleButton.Content>
                                     </ToggleButton>
 
-                                    <ToggleButton x:Name="CanvasTextBoxItlaicButton"
+                                    <ToggleButton x:Name="CanvasTextBoxItalicButton"
                                                   Style="{StaticResource CanvasTextBoxToggleButtonStyle}"
                                                   ToolTipService.ToolTip="Italic Text">
                                         <ToggleButton.Content>

Original file line number	Diff line number	Diff line change
`@@ -3712,7 +3712,10 @@ protected override void OnPointerWheelChanged(PointerRoutedEventArgs e)`
`3712`	`3712`	`if (!e.Handled)`
`3713`	`3713`	`{`
`3714`	`3714`	`PointerPoint pointerPoint = e.GetCurrentPoint(this);`
`3715`		`- bool isForHorizontalScroll = pointerPoint.Properties.IsHorizontalMouseWheel;`
	`3715`	`+`
	`3716`	`+ // A horizontal scroll happens if the mouse has a horizontal wheel OR if the horizontal scrollbar is not disabled AND the vertical scrollbar IS disabled`
	`3717`	`+ bool isForHorizontalScroll = pointerPoint.Properties.IsHorizontalMouseWheel \|\|`
	`3718`	`+ (this.HorizontalScrollBarVisibility != ScrollBarVisibility.Disabled && this.VerticalScrollBarVisibility == ScrollBarVisibility.Disabled);`
`3716`	`3719`
`3717`	`3720`	`if ((isForHorizontalScroll && this.HorizontalScrollBarVisibility == ScrollBarVisibility.Disabled) \|\|`
`3718`	`3721`	`(!isForHorizontalScroll && this.VerticalScrollBarVisibility == ScrollBarVisibility.Disabled))`
`@@ -3721,7 +3724,7 @@ protected override void OnPointerWheelChanged(PointerRoutedEventArgs e)`
`3721`	`3724`	`}`
`3722`	`3725`
`3723`	`3726`	`double offsetDelta = -pointerPoint.Properties.MouseWheelDelta / DATAGRID_mouseWheelDeltaDivider;`
`3724`		`- if (isForHorizontalScroll)`
	`3727`	`+ if (isForHorizontalScroll && pointerPoint.Properties.IsHorizontalMouseWheel)`
`3725`	`3728`	`{`
`3726`	`3729`	`offsetDelta *= -1.0;`
`3727`	`3730`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ private void CanvasTextBoxBoldButton_Clicked(object sender, RoutedEventArgs e)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- private void CanvasTextBoxItlaicButton_Clicked(object sender, RoutedEventArgs e)`
	`86`	`+ private void CanvasTextBoxItalicButton_Clicked(object sender, RoutedEventArgs e)`
`87`	`87`	`{`
`88`	`88`	`if (SelectedTextDrawable != null)`
`89`	`89`	`{`
`90`		`- _drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItlaicButton.IsChecked ?? false);`
	`90`	`+ _drawingSurfaceRenderer.ExecuteUpdateTextBoxStyle(_canvasTextBoxItalicButton.IsChecked ?? false);`
`91`	`91`	`_canvasTextBox.UpdateFontStyle(SelectedTextDrawable.IsItalic);`
`92`	`92`	`ReDrawCanvas();`
`93`	`93`	`}`
`@@ -154,7 +154,7 @@ private void CanvasTextBox_TextChanged(object sender, string text)`
`154`	`154`	`text,`
`155`	`155`	`_canvasTextBoxColorPicker.Color,`
`156`	`156`	`_canvasTextBoxBoldButton.IsChecked ?? false,`
`157`		`- _canvasTextBoxItlaicButton.IsChecked ?? false);`
	`157`	`+ _canvasTextBoxItalicButton.IsChecked ?? false);`
`158`	`158`
`159`	`159`	`ReDrawCanvas();`
`160`	`160`	`_drawingSurfaceRenderer.UpdateSelectedTextDrawable();`
`@@ -184,13 +184,13 @@ private void InkScrollViewer_PointerPressed(object sender, PointerRoutedEventArg`
`184`	`184`	`_canvasTextBoxColorPicker.Color = SelectedTextDrawable.TextColor;`
`185`	`185`	`_canvasTextBoxFontSizeTextBox.Text = SelectedTextDrawable.FontSize.ToString();`
`186`	`186`	`_canvasTextBoxBoldButton.IsChecked = SelectedTextDrawable.IsBold;`
`187`		`- _canvasTextBoxItlaicButton.IsChecked = SelectedTextDrawable.IsBold;`
	`187`	`+ _canvasTextBoxItalicButton.IsChecked = SelectedTextDrawable.IsItalic;`
`188`	`188`
`189`	`189`	`return;`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`_canvasTextBox.UpdateFontSize(TextFontSize);`
`193`		`- _canvasTextBox.UpdateFontStyle(_canvasTextBoxItlaicButton.IsChecked ?? false);`
	`193`	`+ _canvasTextBox.UpdateFontStyle(_canvasTextBoxItalicButton.IsChecked ?? false);`
`194`	`194`	`_canvasTextBox.UpdateFontWeight(_canvasTextBoxBoldButton.IsChecked ?? false);`
`195`	`195`
`196`	`196`	`_inkCanvas.Visibility = Visibility.Collapsed;`