Skip to content

Commit 63cbb4a

Browse files
Nirmal4Gmichael-hawker
Nirmal4G
authored and
michael-hawker
committed
Fix Indentation on certain code-blocks
- Fix indent on jump labels - Fix indent on switch-case block
1 parent bc8c356 commit 63cbb4a

File tree

9 files changed

+257
-257
lines changed

9 files changed

+257
-257
lines changed

‎.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ csharp_new_line_between_query_expression_clauses = true
106106
csharp_indent_block_contents = true
107107
csharp_indent_braces = false
108108
csharp_indent_case_contents = true
109-
csharp_indent_case_contents_when_block = true
110-
csharp_indent_labels = one_less_than_current
109+
csharp_indent_case_contents_when_block = false
110+
csharp_indent_labels = no_change
111111
csharp_indent_switch_labels = true
112112

113113
# Space preferences

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridCellAutomationPeer.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,28 +171,28 @@ protected override object GetPatternCore(PatternInterface patternInterface)
171171
switch (patternInterface)
172172
{
173173
case PatternInterface.Invoke:
174+
{
175+
if (!this.OwningGrid.IsReadOnly &&
176+
this.OwningColumn != null &&
177+
!this.OwningColumn.IsReadOnly)
174178
{
175-
if (!this.OwningGrid.IsReadOnly &&
176-
this.OwningColumn != null &&
177-
!this.OwningColumn.IsReadOnly)
178-
{
179-
return this;
180-
}
181-
182-
break;
179+
return this;
183180
}
184181

182+
break;
183+
}
184+
185185
case PatternInterface.ScrollItem:
186+
{
187+
if (this.OwningGrid.HorizontalScrollBar != null &&
188+
this.OwningGrid.HorizontalScrollBar.Maximum > 0)
186189
{
187-
if (this.OwningGrid.HorizontalScrollBar != null &&
188-
this.OwningGrid.HorizontalScrollBar.Maximum > 0)
189-
{
190-
return this;
191-
}
192-
193-
break;
190+
return this;
194191
}
195192

193+
break;
194+
}
195+
196196
case PatternInterface.GridItem:
197197
case PatternInterface.SelectionItem:
198198
case PatternInterface.TableItem:

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/Automation/DataGridGroupItemAutomationPeer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,15 @@ protected override object GetPatternCore(PatternInterface patternInterface)
306306
case PatternInterface.Table:
307307
return this;
308308
case PatternInterface.ScrollItem:
309+
{
310+
if (this.OwningDataGrid.VerticalScrollBar != null &&
311+
this.OwningDataGrid.VerticalScrollBar.Maximum > 0)
309312
{
310-
if (this.OwningDataGrid.VerticalScrollBar != null &&
311-
this.OwningDataGrid.VerticalScrollBar.Maximum > 0)
312-
{
313-
return this;
314-
}
315-
316-
break;
313+
return this;
317314
}
315+
316+
break;
317+
}
318318
}
319319

320320
return base.GetPatternCore(patternInterface);

‎Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -488,24 +488,24 @@ private ColorChannel GetActiveColorSpectrumThirdDimension()
488488
{
489489
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.SaturationValue:
490490
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.ValueSaturation:
491-
{
492-
// Hue
493-
return ColorChannel.Channel1;
494-
}
491+
{
492+
// Hue
493+
return ColorChannel.Channel1;
494+
}
495495

496496
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.HueValue:
497497
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.ValueHue:
498-
{
499-
// Saturation
500-
return ColorChannel.Channel2;
501-
}
498+
{
499+
// Saturation
500+
return ColorChannel.Channel2;
501+
}
502502

503503
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.HueSaturation:
504504
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.SaturationHue:
505-
{
506-
// Value
507-
return ColorChannel.Channel3;
508-
}
505+
{
506+
// Value
507+
return ColorChannel.Channel3;
508+
}
509509
}
510510

511511
return ColorChannel.Alpha; // Error, should never get here
@@ -671,31 +671,31 @@ private void UpdateColorControlValues()
671671
switch (this.GetActiveColorSpectrumThirdDimension())
672672
{
673673
case ColorChannel.Channel1:
674-
{
675-
// Hue
676-
this.ColorSpectrumThirdDimensionSlider.Minimum = 0;
677-
this.ColorSpectrumThirdDimensionSlider.Maximum = 360;
678-
this.ColorSpectrumThirdDimensionSlider.Value = hue;
679-
break;
680-
}
674+
{
675+
// Hue
676+
this.ColorSpectrumThirdDimensionSlider.Minimum = 0;
677+
this.ColorSpectrumThirdDimensionSlider.Maximum = 360;
678+
this.ColorSpectrumThirdDimensionSlider.Value = hue;
679+
break;
680+
}
681681

682682
case ColorChannel.Channel2:
683-
{
684-
// Saturation
685-
this.ColorSpectrumThirdDimensionSlider.Minimum = 0;
686-
this.ColorSpectrumThirdDimensionSlider.Maximum = 100;
687-
this.ColorSpectrumThirdDimensionSlider.Value = staturation;
688-
break;
689-
}
683+
{
684+
// Saturation
685+
this.ColorSpectrumThirdDimensionSlider.Minimum = 0;
686+
this.ColorSpectrumThirdDimensionSlider.Maximum = 100;
687+
this.ColorSpectrumThirdDimensionSlider.Value = staturation;
688+
break;
689+
}
690690

691691
case ColorChannel.Channel3:
692-
{
693-
// Value
694-
this.ColorSpectrumThirdDimensionSlider.Minimum = 0;
695-
this.ColorSpectrumThirdDimensionSlider.Maximum = 100;
696-
this.ColorSpectrumThirdDimensionSlider.Value = value;
697-
break;
698-
}
692+
{
693+
// Value
694+
this.ColorSpectrumThirdDimensionSlider.Minimum = 0;
695+
this.ColorSpectrumThirdDimensionSlider.Maximum = 100;
696+
this.ColorSpectrumThirdDimensionSlider.Value = value;
697+
break;
698+
}
699699
}
700700
}
701701

@@ -885,29 +885,29 @@ private void SetColorChannel(
885885
switch (channel)
886886
{
887887
case ColorChannel.Channel1:
888-
{
889-
hue = Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 360);
890-
break;
891-
}
888+
{
889+
hue = Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 360);
890+
break;
891+
}
892892

893893
case ColorChannel.Channel2:
894-
{
895-
saturation = Math.Clamp((double.IsNaN(newValue) ? 0 : newValue) / 100, 0, 1);
896-
break;
897-
}
894+
{
895+
saturation = Math.Clamp((double.IsNaN(newValue) ? 0 : newValue) / 100, 0, 1);
896+
break;
897+
}
898898

899899
case ColorChannel.Channel3:
900-
{
901-
value = Math.Clamp((double.IsNaN(newValue) ? 0 : newValue) / 100, 0, 1);
902-
break;
903-
}
900+
{
901+
value = Math.Clamp((double.IsNaN(newValue) ? 0 : newValue) / 100, 0, 1);
902+
break;
903+
}
904904

905905
case ColorChannel.Alpha:
906-
{
907-
// Unlike color channels, default to no transparency
908-
alpha = Math.Clamp((double.IsNaN(newValue) ? 100 : newValue) / 100, 0, 1);
909-
break;
910-
}
906+
{
907+
// Unlike color channels, default to no transparency
908+
alpha = Math.Clamp((double.IsNaN(newValue) ? 100 : newValue) / 100, 0, 1);
909+
break;
910+
}
911911
}
912912

913913
newRgbColor = Uwp.Helpers.ColorHelper.FromHsv(
@@ -936,29 +936,29 @@ private void SetColorChannel(
936936
switch (channel)
937937
{
938938
case ColorChannel.Channel1:
939-
{
940-
red = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 255));
941-
break;
942-
}
939+
{
940+
red = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 255));
941+
break;
942+
}
943943

944944
case ColorChannel.Channel2:
945-
{
946-
green = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 255));
947-
break;
948-
}
945+
{
946+
green = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 255));
947+
break;
948+
}
949949

950950
case ColorChannel.Channel3:
951-
{
952-
blue = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 255));
953-
break;
954-
}
951+
{
952+
blue = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 0 : newValue, 0, 255));
953+
break;
954+
}
955955

956956
case ColorChannel.Alpha:
957-
{
958-
// Unlike color channels, default to no transparency
959-
alpha = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 255 : newValue, 0, 255));
960-
break;
961-
}
957+
{
958+
// Unlike color channels, default to no transparency
959+
alpha = Convert.ToByte(Math.Clamp(double.IsNaN(newValue) ? 255 : newValue, 0, 255));
960+
break;
961+
}
962962
}
963963

964964
newRgbColor = new Color()

0 commit comments

Comments
 (0)