Skip to content

Commit

Permalink
Change all tabs to spaces (#6772)
Browse files Browse the repository at this point in the history
* Replace tabs with spaces

* Remove trailing spaces in root directory

Co-authored-by: Kristen Schau <[email protected]>
  • Loading branch information
krschau and krschau authored Feb 28, 2022
1 parent 6966e16 commit 160b62a
Show file tree
Hide file tree
Showing 42 changed files with 180 additions and 177 deletions.
4 changes: 2 additions & 2 deletions Build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ REM
REM NUGET Restore
REM
if "%PROJECTPATH%" NEQ "" (
call .\Tools\NugetWrapper.cmd restore -MSBuildPath "%MSBUILDDIRPATH%" -NonInteractive %PROJECTPATH%
call .\Tools\NugetWrapper.cmd restore -MSBuildPath "%MSBUILDDIRPATH%" -NonInteractive %PROJECTPATH%
) else (
call .\Tools\NugetWrapper.cmd restore -MSBuildPath "%MSBUILDDIRPATH%" -NonInteractive .\MUXControls.sln
call .\Tools\NugetWrapper.cmd restore -MSBuildPath "%MSBUILDDIRPATH%" -NonInteractive .\MUXControls.sln
)

REM
Expand Down
4 changes: 2 additions & 2 deletions CustomInlineTasks.targets
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
for (int i = 0; i < SourceFiles.Length; i++)
{
string text = File.ReadAllText(SourceFiles[i]);
for (int j = 0; j < Patterns.Length; j++)
{
text = text.Replace(Patterns[j], Replacements[j]);
}
File.WriteAllText(DestinationFiles[i], text);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<IsDebugTestConfiguration>false</IsDebugTestConfiguration>
<IsDebugTestConfiguration Condition="'$(Configuration)' == 'Debug_test'">true</IsDebugTestConfiguration>
<Configuration Condition="'$(Configuration)' == 'Debug_test'">Debug</Configuration>

<BaseOutputPath>$(MSBuildThisFileDirectory)BuildOutput\$(Configuration)\</BaseOutputPath>
<BaseOutputPath Condition="'$(Configuration)' == 'Debug_test'">$(MSBuildThisFileDirectory)BuildOutput\Debug\</BaseOutputPath>
<OutDir>$(BaseOutputPath)\$(Platform)\</OutDir>
Expand Down
2 changes: 1 addition & 1 deletion InnerLoopAreas.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup Condition="$(SolutionName) == 'MUXControlsInnerLoop'">
<!-- Features to include for inner loop build for example:-->
<!-- <FeatureRepeaterEnabled>true</FeatureRepeaterEnabled> -->

<!-- Note that after modifying the file, you will need to close and reopen the solution -->
<!-- for changes to be picked up correctly by Visual Studio and MSBUILD -->
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions SdkVersion.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<!-- By default we use the publicly shipped SDK version which is 21H1 now -->
<MuxSdkVersion Condition="$(UseInsiderSDK) != 'true'">$(SDKVersion21H1)</MuxSdkVersion>

<!-- Setting UseInsiderSDK will allow the code to build to the newest insider SDK
In order to get this from a cmd prompt run
<!-- Setting UseInsiderSDK will allow the code to build to the newest insider SDK
In order to get this from a cmd prompt run
set UseInsiderSDK=true and then launch muxcontrols.sln from that cmd prompt -->
<MuxSdkVersion Condition="$(UseInsiderSDK) == 'true'">$(SDKVersionInsider)</MuxSdkVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions build/FrameworkPackage/MakeFrameworkPackage.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pushd %~dp0
powershell -ExecutionPolicy Unrestricted -NoLogo -NoProfile -Command "&{ %~dpn0.ps1 %*; exit $lastexitcode }"

if %ERRORLEVEL% NEQ 0 (
@echo ##vso[task.logissue type=error;] MakeFrameworkPackage failed with exit code %ERRORLEVEL%
goto END
@echo ##vso[task.logissue type=error;] MakeFrameworkPackage failed with exit code %ERRORLEVEL%
goto END
)

:END
Expand Down
4 changes: 2 additions & 2 deletions build/NuSpecs/MakeAllAppx.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ REM %~dp0 is position of script file


if exist %~dp0"..\..\BuildOutput\Debug\x86\Microsoft.UI.Xaml" (
call %~dp0..\..\tools\MakeAppxHelper.cmd x86 debug %*
call %~dp0..\..\tools\MakeAppxHelper.cmd x86 debug %*
)
if exist %~dp0"..\..\BuildOutput\Release\x86\Microsoft.UI.Xaml" (
call %~dp0..\..\tools\MakeAppxHelper.cmd x86 release%*
call %~dp0..\..\tools\MakeAppxHelper.cmd x86 release%*
)
if exist %~dp0"..\..\BuildOutput\Debug\x64\Microsoft.UI.Xaml" (
call %~dp0..\..\tools\MakeAppxHelper.cmd x64 debug %*
Expand Down
22 changes: 11 additions & 11 deletions dev/AnimatedIcon/Docs/AnimatedIconDevDesign.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ An icon button template which has been updated to support using an animated icon
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal">
<VisualState.Setters>
<Setter Target="Icon.(AnimatedIcon.State)" Value="Normal"/>
</VisualSTate.Setters>
<VisualState.Setters>
<Setter Target="Icon.(AnimatedIcon.State)" Value="Normal"/>
</VisualSTate.Setters>
</VisualState>
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="Icon.(AnimatedIcon.State)" Value="Hover"/>
</VisualSTate.Setters>
<VisualState.Setters>
<Setter Target="Icon.(AnimatedIcon.State)" Value="Hover"/>
</VisualSTate.Setters>
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="Icon.(AnimatedIcon.State)" Value="Pressed"/>
</VisualSTate.Setters>
<VisualState.Setters>
<Setter Target="Icon.(AnimatedIcon.State)" Value="Pressed"/>
</VisualSTate.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
Expand Down Expand Up @@ -117,5 +117,5 @@ Downsides:
Red Flags:
- Adobe After Effects does not support multiple markers being placed on the same frame. I see two options to resolve this:
- Ask Designer to add all of the state names to a single markers comment, ie: "RestToHoverStart,HoverToRestEnd". This would require additional work from lottie gen.
- Do not allow designers to have animations which share end points.
- Ask Designer to add all of the state names to a single markers comment, ie: "RestToHoverStart,HoverToRestEnd". This would require additional work from lottie gen.
- Do not allow designers to have animations which share end points.
4 changes: 2 additions & 2 deletions dev/AnimatedIcon/Docs/MultiStateSegmentLookupProposal.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ Animated Icon is initially being published With a single state property, which h

In order to specify an animation for every state transitions the Lottie author will need to specify 120 markers with the following format:

| [FromState]To[ToState]Start | [FromState]To[ToState]End |
| [FromState]To[ToState]Start | [FromState]To[ToState]End |
|:---:|:---:|
| NormalDraggingToHoverDraggingStart | HoverDraggingToNormalDraggingEnd |
| NormalDraggingToNormalOnStart | NormalDraggingToNormalOnEnd |
| NormalDraggingToNormalOnStart | NormalDraggingToNormalOnEnd |

## Requirements

Expand Down
6 changes: 3 additions & 3 deletions dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void AnimatedVisualPlayer::AnimationPlay::Start()
m_batchCompletedToken = m_batch.Completed([this](winrt::IInspectable const&, winrt::CompositionBatchCompletedEventArgs const&)
{
if (m_owner)
{
{
// If optimization is set to Resources - destroy animations immediately after player stops.
if (m_owner->AnimationOptimization() == winrt::PlayerAnimationOptimization::Resources)
{
Expand Down Expand Up @@ -952,13 +952,13 @@ void AnimatedVisualPlayer::UpdateContent()
if (auto source3 = source.try_as<winrt::IAnimatedVisualSource3>())
{
animatedVisual = source3.TryCreateAnimatedVisual(m_rootVisual.Compositor(), diagnostics, createAnimations);
m_isAnimationsCreated = createAnimations;
m_isAnimationsCreated = createAnimations;
m_animatedVisual.set(animatedVisual);
}
else
{
animatedVisual = source.TryCreateAnimatedVisual(m_rootVisual.Compositor(), diagnostics);
m_isAnimationsCreated = true;
m_isAnimationsCreated = true;

// m_animatedVisual should be updated before DestroyAnimations call
m_animatedVisual.set(animatedVisual);
Expand Down
2 changes: 1 addition & 1 deletion dev/CommonStyles/TextBox_themeresources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
contract5NotPresent:Foreground="{ThemeResource TextControlPlaceholderForeground}"
contract5NotPresent:Foreground="{ThemeResource TextControlPlaceholderForeground}"
contract5Present:Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
Margin="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
Expand Down
2 changes: 1 addition & 1 deletion dev/CommonStyles/TextBox_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
contract5NotPresent:Foreground="{ThemeResource TextControlPlaceholderForeground}"
contract5NotPresent:Foreground="{ThemeResource TextControlPlaceholderForeground}"
contract5Present:Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
Margin="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
Expand Down
6 changes: 3 additions & 3 deletions dev/ImageIcon/APITests/ImageIconTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ public void ImageIconTest()

RunOnUIThread.Execute(() =>
{
imageIcon = new ImageIcon();
imageIcon = new ImageIcon();

/*
#3949 is created to re-enable this part
This is an unparented ImageIcon, so looking up the default foreground and verifying
is a bit wierd. The colors are also chaning, so this is going to fail with those changes
This is an unparented ImageIcon, so looking up the default foreground and verifying
is a bit wierd. The colors are also chaning, so this is going to fail with those changes
So commenting this check out for now to make the test more resilient.
var theme = Application.Current.RequestedTheme;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
<Library Name="Microsoft.UI.Xaml">

<!-- add directives for your library here -->
<!-- add directives for your library here -->

</Library>
</Directives>
30 changes: 15 additions & 15 deletions dev/NavigationView/NavigationView_rs1_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,9 @@
x:Name="PointerRectangle"
Fill="Transparent"
Visibility="Collapsed"/>
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" />
<FontIcon
x:Name="Icon"
Expand Down Expand Up @@ -527,9 +527,9 @@
<Rectangle
x:Name="PointerRectangle"
Fill="Transparent" />
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" />
<FontIcon
x:Name="Icon"
Expand Down Expand Up @@ -843,9 +843,9 @@
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" />
<Grid x:Name="PresenterContentRootGrid">
<!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
Expand Down Expand Up @@ -1003,9 +1003,9 @@
<Rectangle
x:Name="PointerRectangle"
Fill="Transparent" />
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" >
</Border>
<Grid x:Name="ContentGrid">
Expand Down Expand Up @@ -1159,9 +1159,9 @@
x:Name="PointerRectangle"
Fill="Transparent"
Visibility="Collapsed" />
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
<Border
x:Name="RevealBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" />
<Grid x:Name="ContentGrid">
<Grid.ColumnDefinitions>
Expand Down
8 changes: 4 additions & 4 deletions dev/PullToRefresh/RefreshVisualizer/RefreshVisualizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class RefreshVisualizer :

private:
//////////////////////////////////////////////////////
//// OnDependencyPropertyChanged handlers //////
//// OnDependencyPropertyChanged handlers //////
//////////////////////////////////////////////////////
void OnRefreshInfoProviderChanged(const winrt::DependencyPropertyChangedEventArgs& args);

Expand Down Expand Up @@ -71,21 +71,21 @@ class RefreshVisualizer :
bool IsPullDirectionFar();

//////////////////////////////////////////////////////
//// DependencyPropertyBackers //////
//// DependencyPropertyBackers //////
//////////////////////////////////////////////////////
winrt::RefreshVisualizerOrientation m_orientation{ winrt::RefreshVisualizerOrientation::Auto };
winrt::RefreshVisualizerState m_state{ winrt::RefreshVisualizerState::Idle };
tracker_ref<winrt::IRefreshInfoProvider> m_refreshInfoProvider{ this };
tracker_ref<winrt::UIElement> m_content{ this };

///////////////////////////////////////////////
///////// Event Tokens and Sources ////////
///////// Event Tokens and Sources ////////
///////////////////////////////////////////////
winrt::event_token m_RefreshInfoProvider_InteractingForRefreshChangedToken{};
winrt::event_token m_RefreshInfoProvider_InteractionRatioChangedToken{};

///////////////////////////////////////////////
///////// Internal Reference Vars /////////
///////// Internal Reference Vars /////////
///////////////////////////////////////////////
bool m_isInteractingForRefresh{ false };
double m_executionRatio{ 0.8f };
Expand Down
2 changes: 1 addition & 1 deletion dev/Repeater/InspectingDataSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "ItemsSourceView.h"

class InspectingDataSource :
public winrt::implements<InspectingDataSource, ItemsSourceView>
public winrt::implements<InspectingDataSource, ItemsSourceView>
{
public:
ForwardRefToBaseReferenceTracker(ItemsSourceView)
Expand Down
2 changes: 1 addition & 1 deletion dev/ScrollPresenter/SnapPointWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class SnapPointWrapper
static SnapPointBase* GetSnapPointFromWrapper(std::shared_ptr<SnapPointWrapper<T>> snapPointWrapper);

private:
static SnapPointBase* GetSnapPointFromWrapper(const SnapPointWrapper<T>* snapPointWrapper);
static SnapPointBase* GetSnapPointFromWrapper(const SnapPointWrapper<T>* snapPointWrapper);

private:
T m_snapPoint;
Expand Down
6 changes: 3 additions & 3 deletions dev/TeachingTip/TeachingTip.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@
Command="{TemplateBinding ActionButtonCommand}"
CommandParameter="{TemplateBinding ActionButtonCommandParameter}">
<ContentPresenter TextWrapping="WrapWholeWords" Content="{TemplateBinding ActionButtonContent}"/>
</Button>
</Button>
<Button x:Name="CloseButton"
HorizontalAlignment="Stretch"
Style="{TemplateBinding CloseButtonStyle}"
Command="{TemplateBinding CloseButtonCommand}"
CommandParameter="{TemplateBinding CloseButtonCommandParameter}"
Grid.Column="1">
<ContentPresenter TextWrapping="WrapWholeWords" Content="{TemplateBinding CloseButtonContent}"/>
</Button>
<ContentPresenter TextWrapping="WrapWholeWords" Content="{TemplateBinding CloseButtonContent}"/>
</Button>
</Grid>
</StackPanel>
</ScrollViewer>
Expand Down
14 changes: 7 additions & 7 deletions dev/TeachingTip/TestUI/TeachingTipPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ private void TeachingTipInVisualTree_Closed(TeachingTip sender, TeachingTipClose

protected override void OnNavigatedFrom(NavigationEventArgs e)
{
if (testWindowBounds != null && testWindowBounds.IsOpen)
{
testWindowBounds.IsOpen = false;
}
if(testScreenBounds != null && testScreenBounds.IsOpen)
{
testScreenBounds.IsOpen = false;
if (testWindowBounds != null && testWindowBounds.IsOpen)
{
testWindowBounds.IsOpen = false;
}
if(testScreenBounds != null && testScreenBounds.IsOpen)
{
testScreenBounds.IsOpen = false;
}
base.OnNavigatedFrom(e);
}
Expand Down
2 changes: 1 addition & 1 deletion dev/dll/WinRtType.tt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
var winRtTypeName = MapToWinRtName(winmdType);
CppAbiName = MapToAbiName(winmdType);
CppAbiInterfaceName = MapToAbiInterfaceName(winmdType);
var cppFullTypeName = (CppNamespace != null ? (CppNamespace + "::" ) : "") + winRtTypeName;
var cppFullTypeName = (CppNamespace != null ? (CppNamespace + "::" ) : "") + winRtTypeName;
WinRtFullName = string.Join(".", winRtNamespace, winRtTypeName).TrimStart('.');
MetadataFullName = GetMetadataFullName(WinRtFullName);
CppWinRtName = winmdType.IsPrimitive ? GetPrimitiveTypeName(winRtTypeName) : string.Format("winrt::{0}", cppFullTypeName);
Expand Down
Loading

0 comments on commit 160b62a

Please sign in to comment.