Skip to content
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.

Sign up for GitHub

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

Jump to bottom

TeachingTip: Fix bug where empty title/subtitle was not respected in ApplyTemplate leading to gap #3397

Merged
merged 8 commits into from
Mar 13, 2021
Merged

TeachingTip: Fix bug where empty title/subtitle was not respected in ApplyTemplate leading to gap #3397

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75d86fd
Add test
marcelwgn Oct 9, 2020
b1ca3eb
Fix bug
marcelwgn Oct 9, 2020
93be3d2
Update variable names
marcelwgn Oct 9, 2020
5c60421
Update TeachingTip to use visual states to collapse title and subtitle
marcelwgn Oct 16, 2020
fbc09ec
Merge branch 'master' into user/chingucoding/teachingtip-emptytitle-v…
marcelwgn Oct 20, 2020
2bd3e15
Merge branch 'master' into user/chingucoding/teachingtip-emptytitle-v…
marcelwgn Nov 2, 2020
e0d9e37
Merge branch 'master' into user/chingucoding/teachingtip-emptytitle-v…
StephenLPeters Jan 4, 2021
0a64c0c
Merge branch 'master' into user/chingucoding/teachingtip-emptytitle-v…
marcelwgn Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions dev/TeachingTip/APITests/TeachingTipTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,29 @@ public void PropagatePropertiesDown()
});
}

[TestMethod]
public void VerifySubTitleBlockVisibilityOnInitialUnset()
{
TeachingTip teachingTip = null;
RunOnUIThread.Execute(() =>
{
teachingTip = new TeachingTip();
teachingTip.IsOpen = true;
Content = teachingTip;
});

IdleSynchronizer.Wait();

RunOnUIThread.Execute(() =>
{
Verify.AreEqual("", teachingTip.Title);
Verify.AreEqual(Visibility.Collapsed,
TeachingTipTestHooks.GetTitleVisibility(teachingTip));
Verify.AreEqual("", teachingTip.Subtitle);
Verify.AreEqual(Visibility.Collapsed,
TeachingTipTestHooks.GetSubtitleVisibility(teachingTip));
});
}

[TestMethod]
public void TeachingTipHeroContentPlacementTest()
Expand Down
23 changes: 20 additions & 3 deletions dev/TeachingTip/TeachingTip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "pch.h"
#include "pch.h"
#include "common.h"
#include "TeachingTip.h"
#include "RuntimeProfiler.h"
Expand Down Expand Up @@ -49,8 +49,25 @@ void TeachingTip::OnApplyTemplate()
m_closeButton.set(GetTemplateChildT<winrt::Button>(s_closeButtonName, controlProtected));
m_tailEdgeBorder.set(GetTemplateChildT<winrt::Grid>(s_tailEdgeBorderName, controlProtected));
m_tailPolygon.set(GetTemplateChildT<winrt::Polygon>(s_tailPolygonName, controlProtected));
m_titleTextBox.set(GetTemplateChildT<winrt::UIElement>(s_titleTextBoxName, controlProtected));
m_subtitleTextBox.set(GetTemplateChildT<winrt::UIElement>(s_subtitleTextBoxName, controlProtected));
[this](const winrt::UIElement textBlock)
{
m_titleTextBox.set(textBlock);
if (textBlock != nullptr)
{
ToggleVisibilityForEmptyContent(textBlock, Title());
}

}(GetTemplateChildT<winrt::UIElement>(s_titleTextBoxName, controlProtected));
[this](const winrt::UIElement textBlock)
{
m_subtitleTextBox.set(textBlock);
if (textBlock != nullptr)
{
ToggleVisibilityForEmptyContent(textBlock, Subtitle());
}

}(GetTemplateChildT<winrt::UIElement>(s_subtitleTextBoxName, controlProtected));


if (auto&& container = m_container.get())
{
Expand Down