Skip to content

Commit 8993c98

Browse files
ButchersBoyButchersBoy
committed
merge shenanigans
2 parents 8fe063c + 66af848 commit 8993c98

File tree

3 files changed

+26
-53
lines changed

3 files changed

+26
-53
lines changed

‎LICENSE

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
Microsoft Public License (Ms-PL)
1+
The MIT License (MIT)
22

3-
This license governs use of the accompanying software. If you use the software, you
4-
accept this license. If you do not accept the license, do not use the software.
3+
Copyright (c) James Willock, Mulholland Software and Contributors
54

6-
1. Definitions
7-
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the
8-
same meaning here as under U.S. copyright law.
9-
A "contribution" is the original software, or any additions or changes to the software.
10-
A "contributor" is any person that distributes its contribution under this license.
11-
"Licensed patents" are a contributor's patent claims that read directly on its contribution.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1211

13-
2. Grant of Rights
14-
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
15-
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1614

17-
3. Conditions and Limitations
18-
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
19-
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
20-
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
21-
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
22-
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,7 @@
238238
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
239239
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
240240
</ObjectAnimationUsingKeyFrames>
241-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content"
242-
To="1" Duration="0:0:0.3"/>
243-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel"
244-
To="1" Duration="0:0:0.3"/>
241+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="1" Duration="0:0:0.3"/>
245242
</Storyboard>
246243
</VisualTransition>
247244
<VisualTransition GeneratedDuration="0" To="Collapsed">
@@ -252,17 +249,13 @@
252249
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
253250
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
254251
</ObjectAnimationUsingKeyFrames>
255-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content"
256-
To="0" Duration="0:0:0.3"/>
257-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel"
258-
To="0" Duration="0:0:0.3"/>
252+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="0" Duration="0:0:0.3"/>
259253
</Storyboard>
260254
</VisualTransition>
261255
</VisualStateGroup.Transitions>
262256
<VisualState x:Name="Expanded">
263257
<Storyboard>
264258
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="1" Duration="0"/>
265-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel" To="1" Duration="0"/>
266259
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
267260
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
268261
</ObjectAnimationUsingKeyFrames>
@@ -271,7 +264,6 @@
271264
<VisualState x:Name="Collapsed">
272265
<Storyboard>
273266
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="0" Duration="0"/>
274-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel" To="0" Duration="0"/>
275267
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
276268
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Hidden}" />
277269
</ObjectAnimationUsingKeyFrames>
@@ -298,19 +290,16 @@
298290
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
299291
Margin="{TemplateBinding Padding}"
300292
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
301-
<StackPanel.Tag>
302-
<system:Double>0.0</system:Double>
303-
</StackPanel.Tag>
304293
<StackPanel.Height>
305294
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
306295
<Binding ElementName="PART_Content" Path="ActualHeight"/>
307-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
296+
<Binding ElementName="PART_Content" Path="Opacity"/>
308297
</MultiBinding>
309298
</StackPanel.Height>
310299
<StackPanel.Width>
311300
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
312301
<Binding ElementName="PART_Content" Path="ActualWidth"/>
313-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
302+
<Binding ElementName="PART_Content" Path="Opacity"/>
314303
</MultiBinding>
315304
</StackPanel.Width>
316305
<ContentPresenter Name="PART_Content" Focusable="False"

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,7 @@
214214
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
215215
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
216216
</ObjectAnimationUsingKeyFrames>
217-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
218-
To="1" Duration="0:0:0.3"/>
219-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
220-
To="1" Duration="0:0:0.3"/>
217+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="1" Duration="0:0:0.3"/>
221218
</Storyboard>
222219
</VisualTransition>
223220
<VisualTransition GeneratedDuration="0" To="Collapsed">
@@ -228,30 +225,21 @@
228225
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
229226
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
230227
</ObjectAnimationUsingKeyFrames>
231-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
232-
To="0" Duration="0:0:0.3"/>
233-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
234-
To="0" Duration="0:0:0.3"/>
228+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="0" Duration="0:0:0.3"/>
235229
</Storyboard>
236230
</VisualTransition>
237231
</VisualStateGroup.Transitions>
238232
<VisualState x:Name="Expanded">
239233
<Storyboard>
240-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
241-
To="1" Duration="0"/>
242-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
243-
To="1" Duration="0"/>
234+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="1" Duration="0"/>
244235
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
245236
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
246237
</ObjectAnimationUsingKeyFrames>
247238
</Storyboard>
248239
</VisualState>
249240
<VisualState x:Name="Collapsed">
250241
<Storyboard>
251-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
252-
To="0" Duration="0"/>
253-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
254-
To="0" Duration="0"/>
242+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="0" Duration="0"/>
255243
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
256244
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
257245
</ObjectAnimationUsingKeyFrames>
@@ -294,13 +282,10 @@
294282
x:Name="ItemsPanel"
295283
Margin="-16 0 0 0"
296284
Grid.ColumnSpan="2">
297-
<StackPanel.Tag>
298-
<system:Double>0.0</system:Double>
299-
</StackPanel.Tag>
300285
<StackPanel.Height>
301286
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
302287
<Binding ElementName="ItemsHost" Path="ActualHeight"/>
303-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
288+
<Binding ElementName="ItemsHost" Path="Opacity"/>
304289
</MultiBinding>
305290
</StackPanel.Height>
306291
<ItemsPresenter x:Name="ItemsHost"

0 commit comments

Comments
 (0)