Feature/expander #3492
There are no files selected for viewing
This file contains 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 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 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 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,133 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. See LICENSE in the project root for license information. | ||
|
|
||
| #include "pch.h" | ||
| #include "common.h" | ||
| #include "Expander.h" | ||
| #include "RuntimeProfiler.h" | ||
| #include "ResourceAccessor.h" | ||
| #include "ExpanderAutomationPeer.h" | ||
| #include "Utils.h" | ||
| #include "winnls.h" | ||
|
|
||
| static constexpr auto c_expanderHeader = L"ExpanderHeader"sv; | ||
|
|
||
| Expander::Expander() | ||
| { | ||
| __RP_Marker_ClassById(RuntimeProfiler::ProfId_Expander); | ||
|
|
||
| SetDefaultStyleKey(this); | ||
| } | ||
|
|
||
| winrt::AutomationPeer Expander::OnCreateAutomationPeer() | ||
| { | ||
| return winrt::make<ExpanderAutomationPeer>(*this); | ||
| } | ||
|
|
||
| void Expander::OnApplyTemplate() | ||
| { | ||
| winrt::IControlProtected controlProtected{ *this }; | ||
|
|
||
| if (auto toggleButton = GetTemplateChildT<winrt::Control>(c_expanderHeader, *this)) | ||
| { | ||
| // We will do 2 things with the toggle button's peer: | ||
| // 1. Set the events source of the toggle button peer to | ||
| // the expander's automation peer. This is is because we | ||
| // don't want to announce the toggle button's on/off property | ||
| // changes, but the expander's expander/collapse property changes | ||
| // (or on the events source that's set, if it's set) and | ||
| // | ||
| // 2. Set the expander's automation properties name to the | ||
| // toggleButton's in case the expander doesn't have one. This just follows | ||
| // what WPF does. | ||
| if (winrt::AutomationPeer toggleButtonPeer = winrt::FrameworkElementAutomationPeer::FromElement(toggleButton)) | ||
| { | ||
| // 1. Set the events source of the toggle button peer to the expander's. | ||
| if (winrt::AutomationPeer expanderPeer = winrt::FrameworkElementAutomationPeer::FromElement(*this)) | ||
| { | ||
| auto expanderEventsSource = expanderPeer.EventsSource() != nullptr ? | ||
| expanderPeer.EventsSource() : | ||
| expanderPeer; | ||
| toggleButtonPeer.EventsSource(expanderEventsSource); | ||
| } | ||
|
|
||
| // 2. If the expander doesn't have any AutomationProperties.Name set, | ||
| // we will try setting one based on the header. This is how | ||
| // WPF's expanders work. | ||
| if (winrt::AutomationProperties::GetName(*this).empty() | ||
| && !toggleButtonPeer.GetNameCore().empty()) | ||
| { | ||
| winrt::AutomationProperties::SetName(*this, toggleButtonPeer.GetNameCore()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| UpdateExpandState(false); | ||
| UpdateExpandDirection(false); | ||
ejserna marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
|
|
||
| void Expander::RaiseExpandingEvent(const winrt::Expander& container) | ||
|
There was a problem hiding this comment. container is never used, why is it here? |
||
| { | ||
| m_expandingEventSource(*this, nullptr); | ||
|
There was a problem hiding this comment. Invoking an event without arguments?? |
||
| } | ||
|
|
||
| void Expander::RaiseCollapsedEvent(const winrt::Expander& container) | ||
|
There was a problem hiding this comment. container is never used, why is it here? |
||
| { | ||
| m_collapsedEventSource(*this, nullptr); | ||
|
There was a problem hiding this comment. Invoking an event without arguments?? |
||
| } | ||
|
|
||
| void Expander::OnIsExpandedPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& /*args*/) | ||
| { | ||
| if (IsExpanded()) | ||
| { | ||
| RaiseExpandingEvent(*this); | ||
ejserna marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| else | ||
| { | ||
| RaiseCollapsedEvent(*this); | ||
| } | ||
| UpdateExpandState(true); | ||
| } | ||
|
|
||
| void Expander::OnExpandDirectionPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& /*args*/) | ||
| { | ||
| UpdateExpandDirection(true); | ||
| } | ||
|
|
||
| void Expander::UpdateExpandDirection(bool useTransitions) | ||
| { | ||
| const auto direction = ExpandDirection(); | ||
| switch (direction) | ||
| { | ||
| case winrt::ExpandDirection::Down: | ||
| winrt::VisualStateManager::GoToState(*this, L"Down", useTransitions); | ||
| break; | ||
| case winrt::ExpandDirection::Up: | ||
| winrt::VisualStateManager::GoToState(*this, L"Up", useTransitions); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| void Expander::UpdateExpandState(bool useTransitions) | ||
| { | ||
| const auto isExpanded = IsExpanded(); | ||
| if (isExpanded) | ||
| { | ||
| winrt::VisualStateManager::GoToState(*this, L"Expanded", useTransitions); | ||
| } | ||
| else | ||
| { | ||
| winrt::VisualStateManager::GoToState(*this, L"Collapsed", useTransitions); | ||
| } | ||
|
|
||
| if (winrt::AutomationPeer peer = winrt::FrameworkElementAutomationPeer::FromElement(*this)) | ||
| { | ||
| auto expanderPeer = peer.as<ExpanderAutomationPeer>(); | ||
| expanderPeer->RaiseExpandCollapseAutomationEvent( | ||
| isExpanded ? | ||
| winrt::ExpandCollapseState::Expanded : | ||
| winrt::ExpandCollapseState::Collapsed | ||
| ); | ||
| } | ||
| } | ||
This file contains 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,36 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. See LICENSE in the project root for license information. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "pch.h" | ||
| #include "common.h" | ||
|
|
||
| #include "Expander.g.h" | ||
| #include "Expander.properties.h" | ||
|
|
||
| class Expander : | ||
| public ReferenceTracker<Expander, winrt::implementation::ExpanderT>, | ||
| public ExpanderProperties | ||
| { | ||
| public: | ||
| Expander(); | ||
| ~Expander() {} | ||
|
|
||
| // IUIElement | ||
| virtual winrt::AutomationPeer OnCreateAutomationPeer(); | ||
|
|
||
| // IFrameworkElement | ||
| void OnApplyTemplate(); | ||
|
|
||
|
|
||
| void RaiseExpandingEvent(const winrt::Expander& container); | ||
| void RaiseCollapsedEvent(const winrt::Expander& container); | ||
|
|
||
| void OnIsExpandedPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args); | ||
| void OnExpandDirectionPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args); | ||
|
|
||
| private: | ||
| void UpdateExpandDirection(bool useTransitions); | ||
| void UpdateExpandState(bool useTransitions); | ||
| }; |
Oops, something went wrong.
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.
"This is is because" Typo