-
Notifications
You must be signed in to change notification settings - Fork 593
[UWP] Use custom button to show OpenUrl actions as links #3555
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
eaf98e9
[UWP] Use custom button to show OpenUrl actions as links
paulcam206 bcb1818
Merge branch 'master' into paulcam/winrt-link-button
paulcam206 6c8fd53
Merge branch 'master' into paulcam/winrt-link-button
paulcam206 c4b0b77
Merge branch 'master' into paulcam/winrt-link-button
paulcam206 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // Copyright (C) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
| #include "pch.h" | ||
| #include "LinkButton.h" | ||
|
|
||
| namespace AdaptiveNamespace | ||
| { | ||
| winrt::Windows::UI::Xaml::Automation::Peers::AutomationPeer LinkButton::OnCreateAutomationPeer() | ||
| { | ||
| // instead of the standard ButtonAutomationPeer, use our custom peer | ||
| return winrt::make<LinkButtonAutomationPeer>(*this); | ||
| } | ||
|
|
||
| LinkButtonAutomationPeer::LinkButtonAutomationPeer(LinkButton& linkButton) : | ||
| winrt::Windows::UI::Xaml::Automation::Peers::ButtonAutomationPeerT<LinkButtonAutomationPeer>( | ||
| linkButton.operator winrt::Windows::UI::Xaml::Controls::Button()) | ||
| { | ||
| } | ||
|
|
||
| winrt::Windows::UI::Xaml::Automation::Peers::AutomationControlType LinkButtonAutomationPeer::GetAutomationControlType() const | ||
| { | ||
| return winrt::Windows::UI::Xaml::Automation::Peers::AutomationControlType::Hyperlink; | ||
| } | ||
|
|
||
| winrt::Windows::UI::Xaml::Automation::Peers::AutomationControlType LinkButtonAutomationPeer::GetAutomationControlTypeCore() const | ||
| { | ||
| return winrt::Windows::UI::Xaml::Automation::Peers::AutomationControlType::Hyperlink; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // Copyright (C) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
| #pragma once | ||
|
|
||
| namespace AdaptiveNamespace | ||
| { | ||
| // LinkButton is a templated button that exists strictly to behave as a button but appear as a link for | ||
| // accessibility purposes. | ||
| struct LinkButton : public winrt::Windows::UI::Xaml::Controls::ButtonT<LinkButton> | ||
| { | ||
| winrt::Windows::UI::Xaml::Automation::Peers::AutomationPeer OnCreateAutomationPeer(); | ||
| }; | ||
|
|
||
| struct LinkButtonAutomationPeer | ||
| : public winrt::Windows::UI::Xaml::Automation::Peers::ButtonAutomationPeerT<LinkButtonAutomationPeer> | ||
| { | ||
| LinkButtonAutomationPeer(LinkButton& linkButton); | ||
|
|
||
| winrt::Windows::UI::Xaml::Automation::Peers::AutomationControlType GetAutomationControlType() const; | ||
| winrt::Windows::UI::Xaml::Automation::Peers::AutomationControlType GetAutomationControlTypeCore() const; | ||
| }; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,3 +57,9 @@ | |
| #include <windows.foundation.collections.h> | ||
| #include <windows.ui.xaml.shapes.h> | ||
| #include <windows.ui.xaml.markup.h> | ||
|
|
||
| #include <winrt/base.h> | ||
| #include <winrt/Windows.UI.Xaml.Automation.h> | ||
| #include <winrt/Windows.UI.Xaml.Automation.Peers.h> | ||
| #include <winrt/Windows.UI.Xaml.Controls.h> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice! Thanks for getting this done and getting us started on the winrt/cpp route ! |
||
| #include <winrt/Windows.UI.Xaml.Controls.Primitives.h> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we just add some very basic unit tests to test construction etc of the new LinkButton object type? Also how much of manual testing should we try for this? ANy backcompat issues that you anticipate at all ?