Add new TextBlock styles #4108

marcelwgn · 2021-02-05T10:04:54Z

Description

Adding new TextBlock styles and update the TextBox test page to include TextBlock samples of the new style.

Motivation and Context

Closes #4106

How Has This Been Tested?

Tested manually

Screenshots (if appropriate):

…samples

mdtauk · 2021-02-05T11:42:53Z

YAY 10X style typography has arrived!

Now to cajole the Windows 10 Settings team into updating the inbox app into using them (or just moving to the 10X app ASAP) 😁

dev/CommonStyles/TextBlock_themeresources_v2.5.xaml

licanhua · 2021-02-05T16:55:37Z

dev/CommonStyles/TextBlock_themeresources.xaml

+    </Style>
+
+    <Style x:Key="CaptionTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+        <Setter Property="FontSize" Value="12" />


We should not hard code 12, please use TextBoxIconFontSize

Having a TextBlock style depend on a TextBox resource sounds a bit confusing to me.

I didn't notice the difference between block and box.
You can create a new keyed resource

Added new lightweight styling resources for all font sizes.

licanhua · 2021-02-05T16:55:59Z

dev/CommonStyles/TextBlock_themeresources.xaml

+    </Style>
+
+    <Style x:Key="BodyTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+        <Setter Property="FontSize" Value="14" />


Don't hard code this value

Would you like me to create themeresources for all the font sizes defined in the styles or just specific ones?

generally speaking. yes. With a keyed Themeresource, user is able to change the size easily without re-template the the style.
The side effect is a little performance penalty.
Of course, these styles are very simple, so I let @YuliKl or @ranjeshj to make the decision.

Added new resources now though I think that either way doesn't make a big difference.

dev/CommonStyles/TextBlock_themeresources.xaml

dev/CommonStyles/CommonStyles.vcxitems

ranjeshj · 2021-02-12T13:09:20Z

/azp run

azure-pipelines · 2021-02-12T13:09:37Z

Azure Pipelines successfully started running 1 pipeline(s).

licanhua

YuliKl · 2021-02-12T22:53:17Z

dev/CommonStyles/TextBlock_themeresources.xaml

+    <x:Double x:Key="CaptionTextBlockFontSize">12</x:Double>
+    <x:Double x:Key="BodyTextBlockFontSize">14</x:Double>
+    <x:Double x:Key="BodyStrongTextBlockFontSize">14</x:Double>
+    <x:Double x:Key="SubtitleTextBlockFontSize">20</x:Double>
+    <x:Double x:Key="TitleTextBlockFontSize">20</x:Double>
+    <x:Double x:Key="TitleLargeTextBlockFontSize">40</x:Double>
+    <x:Double x:Key="DisplayTextBlockFontSize">68</x:Double>


@licanhua is this really necessary? We didn't have the font sizes called out in generic.xaml. Seems like we're adding another layer of obfuscation for ... maybe no good reason?

dev/CommonStyles/TextBlock_themeresources.xaml

YuliKl · 2021-02-12T22:57:43Z

dev/CommonStyles/TextBlock_themeresources.xaml

+    <x:Double x:Key="BodyTextBlockFontSize">14</x:Double>
+    <x:Double x:Key="BodyStrongTextBlockFontSize">14</x:Double>


Even if we keep these resources, I don't think we need distinct onces for body vs body strong. They're both body size (14), with "strong" referring to font weight. The font size for anything called "body" should stay in sync. So I would simply delete BodyStrongTextBlockFontSize and use BodyTextBlockFontSize inside the body strong style.

Fixed that in the new styles project, left the old styles project as is since we don't want to interfere with existing styles and as such need to either introduce a lightweight styling resource for the BodyStrongTextBlock fontsize or leave them out of that completely.

dev/CommonStyles/TextBlock_themeresources.xaml

ranjeshj · 2021-02-13T23:19:49Z

/azp run

azure-pipelines · 2021-02-13T23:20:05Z

Azure Pipelines successfully started running 1 pipeline(s).

ranjeshj · 2021-02-16T21:42:30Z

@chingucoding looks like we have a failure in the visual baseline comparision.

marcelwgn · 2021-02-16T21:53:09Z

@ranjeshj Updated the verification files now and merged with master.

ranjeshj · 2021-02-17T01:13:56Z

/azp run

azure-pipelines · 2021-02-17T01:14:11Z

Azure Pipelines successfully started running 1 pipeline(s).

licanhua · 2021-02-19T00:44:59Z

@chingucoding Can you update the master files from the build pipeline, or cherry-pick this commit from user/canhua/text

8bbff51

marcelwgn · 2021-02-19T09:02:40Z

Updated verification files now @licanhua.

ranjeshj · 2021-02-19T14:29:09Z

/azp run

azure-pipelines · 2021-02-19T14:31:05Z

Azure Pipelines successfully started running 1 pipeline(s).

licanhua · 2021-02-19T19:59:44Z

/azp run

azure-pipelines · 2021-02-19T20:00:01Z

Azure Pipelines successfully started running 1 pipeline(s).

marcelwgn · 2021-02-19T20:02:47Z

@kmahone Is there anything you/we could do to make the infra more resilient against this:

Starting: OutputTestResults.ps1
==============================================================================
Task         : PowerShell
Description  : Run a PowerShell script on Linux, macOS, or Windows
Version      : 2.180.1
Author       : Microsoft Corporation
Help         : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/powershell
==============================================================================
Generating script.
Formatted command: . 'D:\a\1\s\build\Helix\OutputTestResults.ps1' -MinimumExpectedTestsExecutedCount '3000' -CheckJobAttempt $true
========================== Starting Command Output ===========================
"C:\windows\System32\WindowsPowerShell\v1.0\powershell.exe" -NoLogo -NoProfile -NonInteractive -ExecutionPolicy Unrestricted -Command ". 'D:\a\_temp\9c78780d-8968-49a3-8c1b-81f172dd6a5a.ps1'"
Checking test results...
queryUri = https://dev.azure.com/ms/microsoft-ui-xaml/_apis/test/runs?buildUri=vstfs:///Build/Build/140748&includeRunDetails=true&api-version=5.0
Processing results from test run 'windows.10.amd64.clientrs5.open.xaml'
Processing results from test run 'windows.10.amd64.clientrs2.open.xaml'
Skipping test run 'windows.10.amd64.clientrs5.open.xaml', since we have already processed a test run of that name.
Skipping test run 'windows.10.amd64.clientrs2.open.xaml', since we have already processed a test run of that name.
Processing results from test run 'windows.10.amd64.clientrs3.open.xaml'
Invoke-RestMethod : Unable to read data from the transport connection: An existing connection was forcibly closed by 
the remote host.
At D:\a\1\s\build\Helix\OutputTestResults.ps1:53 char:20
+ ... stResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-versi ...
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (:) [Invoke-RestMethod], IOException
    + FullyQualifiedErrorId : System.IO.IOException,Microsoft.PowerShell.Commands.InvokeRestMethodCommand
 
##[error]PowerShell exited with code '1'.
Finishing: OutputTestResults.ps1

Or is this just something we have to accept to happen occasionally?

kmahone · 2021-02-19T20:13:12Z

@chingucoding we hit that issue from time to time where the REST call that we make fails due to random server side issues. I was able to work around this by adding some retry logic to the script, but that is in the WinUI3 fork and has not been back-ported to the WinUI2 repo. If you are interested in making the change, I can share the updated script with you.

marcelwgn · 2021-02-19T20:16:02Z

Sure, if I can help with backporting and it's not too complicated, feel free to share the updated script with me and I'll create a PR for this!

kmahone · 2021-02-19T20:52:43Z

Sure, if I can help with backporting and it's not too complicated, feel free to share the updated script with me and I'll create a PR for this!

I've attached an updated version of AzurePipelinesHelperScripts.ps1, that includes simple implementations of Download-FileWithRetries, Invoke-RestMethodWithRetries and Download-StringWithRetries. Update OutputTestResults.ps1, ProsessHelixFiles.ps1 and UpdateUnreliableTests.ps1 so that they call these functions instead of Invoke-RestMethod, DownloadFile and DownloadString.

The Azure DevOps rest apis are usually pretty stable, so only the calls to the Helix apis need to be updated.

AzurePipelinesHelperScripts.txt

marcelwgn · 2021-02-19T21:08:31Z

Thanks for sharing @kmahone , I'll try to get this over the weekend and create a PR.

kmahone · 2021-02-19T21:10:54Z

Thanks for sharing @kmahone , I'll try to get this over the weekend and create a PR.

Excellent. Thanks for jumping on this! It should make the test passes more reliable.

* Add new TextBlock styles and update test page for textbox to include samples * Update 2.5 file * Add lightweight styling resources * CR feedback * Update verification files * Update verification files

Add new TextBlock styles and update test page for textbox to include …

e77ac0c

…samples

ghost added the needs-triage Issue needs to be triaged by the area owners label Feb 5, 2021

ranjeshj reviewed Feb 5, 2021

View reviewed changes

dev/CommonStyles/TextBlock_themeresources_v2.5.xaml Show resolved Hide resolved

licanhua reviewed Feb 5, 2021

View reviewed changes

Update 2.5 file

407897f

StephenLPeters added area-TextBlocks TextBlock, RichTextBlock team-Controls Issue for the Controls team and removed needs-triage Issue needs to be triaged by the area owners labels Feb 6, 2021

ranjeshj requested a review from YuliKl February 8, 2021 18:28

Add lightweight styling resources

2a5e757

licanhua approved these changes Feb 12, 2021

View reviewed changes

YuliKl reviewed Feb 12, 2021

View reviewed changes

CR feedback

72b40da

marcelwgn added 2 commits February 16, 2021 22:48

Update verification files

e2dc067

Merge branch 'master' into user/chingucoding/new-textblock-styles

06b4bbe

Update verification files

c63923b

ranjeshj merged commit 3f0ca9f into microsoft:master Feb 19, 2021

marcelwgn mentioned this pull request Feb 20, 2021

Improve helix failure resilience with API call retries #4267

Merged

Kinnara added a commit to Kinnara/ModernWpf that referenced this pull request Oct 30, 2023

Port microsoft/microsoft-ui-xaml#4108

4c1ba43

Kinnara added a commit to Kinnara/ModernWpf that referenced this pull request Oct 30, 2023

Port microsoft/microsoft-ui-xaml#4108 (#590)

1300694

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new TextBlock styles #4108

Add new TextBlock styles #4108

marcelwgn commented Feb 5, 2021

mdtauk commented Feb 5, 2021

licanhua Feb 5, 2021

marcelwgn Feb 5, 2021

licanhua Feb 8, 2021

marcelwgn Feb 8, 2021

licanhua Feb 5, 2021

marcelwgn Feb 5, 2021

licanhua Feb 8, 2021

marcelwgn Feb 8, 2021

ranjeshj commented Feb 12, 2021

azure-pipelines bot commented Feb 12, 2021

licanhua left a comment

YuliKl Feb 12, 2021

YuliKl Feb 12, 2021

marcelwgn Feb 12, 2021

ranjeshj commented Feb 13, 2021

azure-pipelines bot commented Feb 13, 2021

ranjeshj commented Feb 16, 2021

marcelwgn commented Feb 16, 2021

ranjeshj commented Feb 17, 2021

azure-pipelines bot commented Feb 17, 2021

licanhua commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

ranjeshj commented Feb 19, 2021

azure-pipelines bot commented Feb 19, 2021

licanhua commented Feb 19, 2021

azure-pipelines bot commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

kmahone commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

kmahone commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

kmahone commented Feb 19, 2021

		<x:Double x:Key="BodyTextBlockFontSize">14</x:Double>
		<x:Double x:Key="BodyStrongTextBlockFontSize">14</x:Double>

Add new TextBlock styles #4108

Add new TextBlock styles #4108

Conversation

marcelwgn commented Feb 5, 2021

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

mdtauk commented Feb 5, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ranjeshj commented Feb 12, 2021

azure-pipelines bot commented Feb 12, 2021

licanhua left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ranjeshj commented Feb 13, 2021

azure-pipelines bot commented Feb 13, 2021

ranjeshj commented Feb 16, 2021

marcelwgn commented Feb 16, 2021

ranjeshj commented Feb 17, 2021

azure-pipelines bot commented Feb 17, 2021

licanhua commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

ranjeshj commented Feb 19, 2021

azure-pipelines bot commented Feb 19, 2021

licanhua commented Feb 19, 2021

azure-pipelines bot commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

kmahone commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

kmahone commented Feb 19, 2021

marcelwgn commented Feb 19, 2021

kmahone commented Feb 19, 2021