Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
punker76 committed Jun 4, 2020
2 parents e313e85 + c2a380d commit 5a79c04
Show file tree
Hide file tree
Showing 20 changed files with 540 additions and 326 deletions.
58 changes: 37 additions & 21 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,53 @@
---
name: Bug report
about: Create a report to help us improve MahApps.Metro
about: Create a bug report to help us to improve MahApps.Metro
title: ''
labels: Bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is. Questions about usage are better asked in the [Gitter](https://gitter.im/MahApps/MahApps.Metro) room or at [stackoverflow](http://stackoverflow.com/questions/tagged/mahapps.metro).
## Describe the bug

<!--
A clear and concise description of what the bug is. Questions about usage are better asked in the Gitter https://gitter.im/MahApps/MahApps.Metro room or at StackOverflow http://stackoverflow.com/questions/tagged/mahapps.metro
-->

## Steps to reproduce

<!--
A description of how to trigger this bug.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
If it's possible follow these guidelines for a good sample and I will most likely look at the issue sooner:
**Screenshots**
If applicable, add screenshots to help explain your problem.
- Post a full GitHub repository. Not a zip file, half baked snippet etc. If GitHub is new to you consider it a great learning opportunity and chance to get involved.
- The repository should have just ONE step max for me to get running, and that is "Restore NuGet Packages". If there are any other missing dependencies, or new features I will most likely move on to another issue.
- I'm not trying to be awkward. I'm just busy and I'm helping a lot of people, not just you, so help me out and I will help you out.
**Environment(please complete the following information):**
- MahApps.Metro version [e.g. v1.6.4]
- OS: [e.g. Win10 1803]
- Visual Studio [e.g. 2017 15.7.1]
- .NET Framework [e.g. 4.7.1]
-->

**Repo**
If it's possible follow these guidelines for a good sample and I will most likely look at the issue sooner:
## Expected behavior

<!-- A description of what you're expecting, possibly containing screenshots or reference material. -->

## Actual behavior

<!-- What's actually happening? -->

## Environment

```
MahApps.Metro version: v2.0.0
Windows build number: Win10 1909 [Version 10.0.18363.836]
Visual Studio: 2019 16.6.0
Target Framework: .Net Core 3.1 (v4.5.2, v4.7.2)
```

- Post a full GitHub repository. Not a zip file, half baked snippet etc. If GitHub is new to you consider it a great learning opportunity and chance to get involved.
- The repository should have just ONE step max for me to get running, and that is "Restore NuGet Packages". If there are any other missing dependencies, or uncompiling features I will most likely move on to another issue.
- I'm not trying to be awkward. I'm just busy and I'm helping a lot of people, not just you, so help me out and I will help you out.
## Screenshots

**Additional context**
Add any other context about the problem here.
<!-- If applicable, add screenshots to help explain your problem. -->
15 changes: 9 additions & 6 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
---
name: Feature request
about: Suggest an idea for MahApps.Metro
title: ''
labels: Feature Request
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
## Describe the feature

**Describe the solution you'd like**
<!--
Describe your feature request.
A clear and concise description of what you want to happen.
-->

**Additional context**
Add any other context or screenshots about the feature request here.
## Additional context

**Closed Issues**
<!-- Add any other context or screenshots about the feature request here. -->
17 changes: 11 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
**Describe the changes you have made to improve this project**
## Describe the changes you have made to improve this project

<!--
Is your feature request related to a problem? Please describe.
A clear and concise description of what the change is.
-->

**Unit test**
## Unit test

If it's possible then make a unit test for your changes.
<!-- If it's possible then make a unit test for your changes. -->

**Additional context**
## Additional context

Add any other context or screenshots about the feature request here.
<!-- Add any other context or screenshots about the feature request here. -->

**Closed Issues**
## Closed Issues

<!-- Closes #xxxx -->
1 change: 0 additions & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ branches:
master:
mode: ContinuousDeployment
tag: rc
increment: Minor
prevent-increment-of-merged-branch-version: true
track-merge-target: false
is-release-branch: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@
<TabItem Header="Start">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
Expand Down Expand Up @@ -170,13 +172,18 @@
Header="Hidden Stuff">
<StackPanel Orientation="Vertical">
<TextBlock Text="...42..." />
<Expander ExpandDirection="Down" Header="Second Hidden Stuff">
<Expander ExpandDirection="Down"
Header="Second Hidden Stuff"
IsExpanded="True">
<StackPanel Orientation="Vertical">
<TextBlock Text="...is the Answer to the Ultimate Question of Life, The Universe, and Everything" />
</StackPanel>
</Expander>
</StackPanel>
</Expander>
<Button Grid.Row="2"
Margin="20"
Content="Beam me up..." />
</Grid>
</TabItem>
<TabItem Header="Demo">
Expand Down
31 changes: 31 additions & 0 deletions src/MahApps.Metro/Accessibility/AccessibilitySwitches.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#if !NET452
using System;
using System.Runtime.CompilerServices;
#endif

namespace MahApps.Metro.Accessibility
{
public static class AccessibilitySwitches
{
#region UseNetFx472CompatibleAccessibilityFeatures

internal const string UseLegacyAccessibilityFeatures3SwitchName = "Switch.UseLegacyAccessibilityFeatures.3";

/// <summary>
/// Switch to force accessibility to only use features compatible with .NET 472
/// When true, all accessibility features are compatible with .NET 472
/// When false, accessibility features added in .NET versions greater than 472 can be enabled.
/// </summary>
public static bool UseNetFx472CompatibleAccessibilityFeatures
{
#if NET452
get => false;
#else
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => AppContext.TryGetSwitch(UseLegacyAccessibilityFeatures3SwitchName, out bool flag) && flag == true;
#endif
}

#endregion
}
}
Loading

0 comments on commit 5a79c04

Please sign in to comment.