Skip to content

Commit 7b060c6

Browse files
l1pton17l1pton17
committed
Merge remote-tracking branch 'refs/remotes/ButchersBoy/master' into DateTimePickerAnimation
2 parents 60a27c2 + 560610b commit 7b060c6

18 files changed

+623
-197
lines changed

‎.paket/paket.bootstrapper.exe

25 KB
Binary file not shown.

‎.paket/paket.exe

3.72 MB
Binary file not shown.

‎.paket/paket.targets

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
11+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<!-- Paket command -->
15+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
16+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
17+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
18+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand>
21+
<!-- Commands -->
22+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
23+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
24+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
25+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
26+
<!-- We need to ensure packages are restored prior to assembly resolve -->
27+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
28+
</PropertyGroup>
29+
<Target Name="CheckPrerequisites">
30+
<!-- Raise an error if we're unable to locate paket.exe -->
31+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
32+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
33+
</Target>
34+
<Target Name="DownloadPaket">
35+
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
36+
</Target>
37+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
38+
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" />
39+
</Target>
40+
</Project>

‎MainDemo.Wpf/MenusAndToolBars.xaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</MenuItem.Icon>
1919
</MenuItem>
2020
<MenuItem Header="Save As.." />
21-
<MenuItem Header="Exit">
21+
<MenuItem Header="Exit" InputGestureText="Ctrl+E">
2222
<MenuItem.Icon>
2323
<Viewbox Width="16" Height="16">
2424
<Canvas Width="24" Height="24">
@@ -30,9 +30,13 @@
3030
<Separator />
3131
<MenuItem Header="Excellent" IsCheckable="True" IsChecked="True" />
3232
<MenuItem Header="Rubbish" IsCheckable="True" />
33-
<MenuItem Header="Dig Deeper">
34-
<MenuItem Header="Enlightenment?" />
35-
<MenuItem Header="Disappointment" />
33+
<MenuItem Header="Dig Deeper" InputGestureText="Ctrl+D">
34+
<MenuItem Header="Enlightenment?" IsCheckable="True" />
35+
<MenuItem Header="Disappointment" IsCheckable="True" />
36+
</MenuItem>
37+
<MenuItem Header="Look Deeper" InputGestureText="Ctrl+D">
38+
<MenuItem Header="Plain" />
39+
<MenuItem Header="Ice Cream" />
3640
</MenuItem>
3741
</MenuItem>
3842
<MenuItem Header="_Edit">

‎MainDemo.Wpf/Shadows.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
>2</Button>
4040
<Button Style="{DynamicResource MaterialDesignFloatingActionButton}"
4141
Margin="16 0 0 0"
42+
wpf:ShadowAssist.ShadowDepth="Depth3"
4243
>3</Button>
4344
<Button Style="{DynamicResource MaterialDesignFloatingActionButton}"
4445
Margin="16 0 0 0"

‎MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
<Name>MaterialDesignThemes.Wpf</Name>
102102
</ProjectReference>
103103
</ItemGroup>
104-
<ItemGroup />
105104
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106105
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
107106
Other similar extension points exist, see Microsoft.Common.targets.

‎MaterialDesignThemes.Wpf/Converters/TextFieldHintVisibilityConverter.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ namespace MaterialDesignThemes.Wpf.Converters
77
{
88
public class TextFieldHintVisibilityConverter : IValueConverter
99
{
10+
public Visibility IsEmptyValue { get; set; } = Visibility.Visible;
11+
public Visibility IsNotEmptyValue { get; set; } = Visibility.Hidden;
12+
1013
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
1114
{
12-
return string.IsNullOrEmpty((value ?? "").ToString()) ? Visibility.Visible : Visibility.Hidden;
15+
return string.IsNullOrEmpty((value ?? "").ToString()) ? IsEmptyValue : IsNotEmptyValue;
1316
}
1417

1518
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

‎MaterialDesignThemes.Wpf/CustomValidationPopup.cs

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎MaterialDesignThemes.Wpf/DialogHost.cs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text;
54
using System.Threading;
65
using System.Threading.Tasks;
76
using System.Windows;
@@ -93,7 +92,6 @@ public DialogHost()
9392
{
9493
Loaded += OnLoaded;
9594
Unloaded += OnUnloaded;
96-
SizeChanged += (sender, args) => TriggerPopupReposition();
9795

9896
CommandBindings.Add(new CommandBinding(CloseDialogCommand, CloseDialogHandler));
9997
CommandBindings.Add(new CommandBinding(OpenDialogCommand, OpenDialogHandler));
@@ -294,45 +292,15 @@ private string SelectState()
294292
return IsOpen ? OpenStateName : ClosedStateName;
295293
}
296294

297-
private void TriggerPopupReposition()
298-
{
299-
if (_popup == null) return;
300-
301-
_popup.HorizontalOffset++;
302-
_popup.HorizontalOffset--;
303-
}
304-
305295
private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs)
306296
{
307297
LoadedInstances.Remove(this);
308-
309-
if (_window != null)
310-
{
311-
_window.LocationChanged -= WindowOnLocationChanged;
312-
_window.SizeChanged -= WindowOnSizeChanged;
313-
}
314298
SetCurrentValue(IsOpenProperty, false);
315299
}
316300

317301
private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
318302
{
319303
LoadedInstances.Add(this);
320-
321-
_window = Window.GetWindow(this);
322-
if (_window == null) return;
323-
324-
_window.LocationChanged += WindowOnLocationChanged;
325-
_window.SizeChanged += WindowOnSizeChanged;
326-
}
327-
328-
private void WindowOnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
329-
{
330-
TriggerPopupReposition();
331-
}
332-
333-
private void WindowOnLocationChanged(object sender, EventArgs eventArgs)
334-
{
335-
TriggerPopupReposition();
336304
}
337305
}
338306
}

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4242
</PropertyGroup>
4343
<ItemGroup>
44+
<Compile Include="..\paket-files\punker76\Controlz\src\Controlz\Controlz\PopupEx.cs">
45+
<Paket>True</Paket>
46+
<Link>Controlz/PopupEx.cs</Link>
47+
</Compile>
4448
<Reference Include="System" />
4549
<Reference Include="System.Data" />
4650
<Reference Include="System.Xml" />
@@ -218,7 +222,6 @@
218222
<Compile Include="Converters\ShadowConverter.cs" />
219223
<Compile Include="Converters\SizeToRectConverter.cs" />
220224
<Compile Include="CustomPopupPlacementCallbackHelper.cs" />
221-
<Compile Include="CustomValidationPopup.cs" />
222225
<Compile Include="DataGridAssist.cs" />
223226
<Compile Include="DateTimeEx.cs" />
224227
<Compile Include="DialogClosingEventArgs.cs" />
@@ -289,7 +292,6 @@
289292
<Name>MaterialDesignColors.Wpf</Name>
290293
</ProjectReference>
291294
</ItemGroup>
292-
<ItemGroup />
293295
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
294296
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
295297
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)