Skip to content

Commit 6530a71

Browse files
NaBianNaBian
committed
add BlendEffectBox
1 parent f6da5e1 commit 6530a71

File tree

17 files changed

+195
-500
lines changed

17 files changed

+195
-500
lines changed

‎src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,12 +471,6 @@
471471
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\cloud.png">
472472
<Link>Resources\Img\cloud.png</Link>
473473
</Resource>
474-
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\f.png">
475-
<Link>Resources\Img\f.png</Link>
476-
</Resource>
477-
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\b.png">
478-
<Link>Resources\Img\b.png</Link>
479-
</Resource>
480474
</ItemGroup>
481475
<ItemGroup>
482476
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">

‎src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@
7676
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\GrayScaleEffect.ps">
7777
<Link>Resources\Effects\GrayScaleEffect.ps</Link>
7878
</Resource>
79-
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\MultiplyBlendEffect.ps">
80-
<Link>Resources\Effects\MultiplyBlendEffect.ps</Link>
81-
</Resource>
8279
</ItemGroup>
8380
<ItemGroup>
8481
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottom.png">

‎src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,12 +547,6 @@
547547
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\cloud.png">
548548
<Link>Resources\Img\cloud.png</Link>
549549
</Resource>
550-
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\f.png">
551-
<Link>Resources\Img\f.png</Link>
552-
</Resource>
553-
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\b.png">
554-
<Link>Resources\Img\b.png</Link>
555-
</Resource>
556550
</ItemGroup>
557551
<ItemGroup>
558552
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json">

‎src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@
128128
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\GrayScaleEffect.ps">
129129
<Link>Resources\Effects\GrayScaleEffect.ps</Link>
130130
</Resource>
131-
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\MultiplyBlendEffect.ps">
132-
<Link>Resources\Effects\MultiplyBlendEffect.ps</Link>
133-
</Resource>
134131
</ItemGroup>
135132
<ItemGroup>
136133
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottom.png">

‎src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -610,12 +610,6 @@
610610
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\cloud.png">
611611
<Link>Resources\Img\cloud.png</Link>
612612
</Resource>
613-
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\f.png">
614-
<Link>Resources\Img\f.png</Link>
615-
</Resource>
616-
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\b.png">
617-
<Link>Resources\Img\b.png</Link>
618-
</Resource>
619613
</ItemGroup>
620614
<ItemGroup>
621615
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">

‎src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,6 @@
199199
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\GrayScaleEffect.ps">
200200
<Link>Resources\Effects\GrayScaleEffect.ps</Link>
201201
</Resource>
202-
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Effects\MultiplyBlendEffect.ps">
203-
<Link>Resources\Effects\MultiplyBlendEffect.ps</Link>
204-
</Resource>
205202
</ItemGroup>
206203
<ItemGroup>
207204
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\Images\GlowWindow\bottom.png">

‎src/Shared/HandyControlDemo_Shared/Resources/Img/b.png‎

-18.8 KB
Binary file not shown.

‎src/Shared/HandyControlDemo_Shared/Resources/Img/f.png‎

-20.4 KB
Binary file not shown.

‎src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml‎

Lines changed: 59 additions & 363 deletions
Large diffs are not rendered by default.

‎src/Shared/HandyControl_Shared/HandyControl_Shared.projitems‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@
6868
<Compile Include="$(MSBuildThisFileDirectory)Media\Animation\LinearGeometryKeyFrame.cs" />
6969
<Compile Include="$(MSBuildThisFileDirectory)Media\Animation\ResolvedKeyFrameEntry.cs" />
7070
<Compile Include="$(MSBuildThisFileDirectory)Media\Animation\SplineGeometryKeyFrame.cs" />
71-
<Compile Include="$(MSBuildThisFileDirectory)Media\Effects\BlendEffect.cs" />
72-
<Compile Include="$(MSBuildThisFileDirectory)Media\Effects\BlendEffectMode.cs" />
71+
<Compile Include="$(MSBuildThisFileDirectory)Media\Effects\BlendEffectBox.cs" />
7372
<Compile Include="$(MSBuildThisFileDirectory)Media\Effects\BrightnessEffect.cs" />
7473
<Compile Include="$(MSBuildThisFileDirectory)Media\Effects\ColorComplementEffect.cs" />
7574
<Compile Include="$(MSBuildThisFileDirectory)Media\Effects\ColorMatrixEffect.cs" />
@@ -404,6 +403,10 @@
404403
<SubType>Designer</SubType>
405404
<Generator>MSBuild:Compile</Generator>
406405
</Page>
406+
<Page Include="$(MSBuildThisFileDirectory)Themes\Styles\BlendEffectBox.xaml">
407+
<SubType>Designer</SubType>
408+
<Generator>MSBuild:Compile</Generator>
409+
</Page>
407410
<Page Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\FrameBaseStyle.xaml">
408411
<SubType>Designer</SubType>
409412
<Generator>MSBuild:Compile</Generator>

0 commit comments

Comments
 (0)