diff --git a/src/source-manifest.json b/src/source-manifest.json index 31b62a30886..456b566aed0 100644 --- a/src/source-manifest.json +++ b/src/source-manifest.json @@ -139,10 +139,10 @@ "commitSha": "7890fbb7f086ae12b11ca85499b18f460c9090dd" }, { - "barId": 275147, + "barId": 275281, "path": "winforms", "remoteUri": "https://github.com/dotnet/winforms", - "commitSha": "17857aa725c3d0860f3aff0178d3b14817eb2266" + "commitSha": "6dd129e422c9b14dc835e669688247386bef2f95" }, { "barId": 274919, diff --git a/src/winforms/eng/Version.Details.xml b/src/winforms/eng/Version.Details.xml index d0791f836cd..b6532e2949e 100644 --- a/src/winforms/eng/Version.Details.xml +++ b/src/winforms/eng/Version.Details.xml @@ -6,106 +6,106 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 - + https://github.com/dotnet/dotnet - 0b032b9f942c1ae8de535a434c4f4a9206fd3339 + 3c34a3f0178f5a637d21c3f0ba5a4ee86ab8e976 diff --git a/src/winforms/eng/Versions.props b/src/winforms/eng/Versions.props index bd85b1a716a..215d3204b77 100644 --- a/src/winforms/eng/Versions.props +++ b/src/winforms/eng/Versions.props @@ -10,30 +10,30 @@ $(MajorVersion).$(MinorVersion).$(PatchVersion) false release - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 5.0.0-preview.7.20320.5 - 10.0.0-preview.7.25363.101 + 10.0.0-preview.7.25364.102 6.1.0-preview.1.24511.1 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 10.0.0-preview.5.25227.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 - 10.0.0-preview.7.25363.101 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 + 10.0.0-preview.7.25364.102 @@ -46,16 +46,16 @@ - 10.0.0-beta.25363.101 - 10.0.0-beta.25363.101 - 10.0.0-beta.25363.101 + 10.0.0-beta.25364.102 + 10.0.0-beta.25364.102 + 10.0.0-beta.25364.102 17.4.0-preview-20220707-01 - - 3.0.0-pre.25 + + 3.0.0 3.1.0 3.0.6-alpha diff --git a/src/winforms/global.json b/src/winforms/global.json index d9436cc48d5..a274e977be5 100644 --- a/src/winforms/global.json +++ b/src/winforms/global.json @@ -21,11 +21,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25363.101", - "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25363.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25363.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25364.102", + "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25364.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25364.102", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25363.101" + "Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25364.102" }, "native-tools": { "cmake": "latest" diff --git a/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewLinkCell.cs b/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewLinkCell.cs index a964cedc7ab..89195caa137 100644 --- a/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewLinkCell.cs +++ b/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewLinkCell.cs @@ -949,7 +949,7 @@ private Rectangle PaintPrivate( Font? getHoverFont = null; bool isActive = (LinkState & LinkState.Active) == LinkState.Active; - LinkUtilities.EnsureLinkFonts(cellStyle.Font!, LinkBehavior, ref getLinkFont, ref getHoverFont, isActive); + LinkUtilities.EnsureLinkFonts(cellStyle.Font!, LinkBehavior, ref getLinkFont, ref getHoverFont); using Font linkFont = getLinkFont; using Font hoverFont = getHoverFont; @@ -1028,6 +1028,18 @@ private Rectangle PaintPrivate( valBounds, linkColor, flags); + + // add a visiting effect. + if (isActive) + { + TextRenderer.DrawText( + g, + formattedValueStr, + LinkState == LinkState.Hover ? hoverFont : linkFont, + new Rectangle(valBounds.X + 1, valBounds.Y, valBounds.Width, valBounds.Height), + linkColor, + flags); + } } } else if (cellCurrent && diff --git a/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/Labels/LinkUtilities.cs b/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/Labels/LinkUtilities.cs index 6d1511a0e0c..259e485424b 100644 --- a/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/Labels/LinkUtilities.cs +++ b/src/winforms/src/System.Windows.Forms/System/Windows/Forms/Controls/Labels/LinkUtilities.cs @@ -163,8 +163,7 @@ public static void EnsureLinkFonts( Font baseFont, LinkBehavior link, [AllowNull] ref Font linkFont, - [AllowNull] ref Font hoverLinkFont, - bool isActive = false) + [AllowNull] ref Font hoverLinkFont) { if (linkFont is not null && hoverLinkFont is not null) { @@ -210,15 +209,6 @@ public static void EnsureLinkFonts( style &= ~FontStyle.Underline; } - if (isActive) - { - style |= FontStyle.Bold; - } - else - { - style &= ~FontStyle.Bold; - } - hoverLinkFont = new Font(f, style); linkFont = hoverLinkFont; } diff --git a/src/winforms/src/test/unit/System.Windows.Forms/System/Windows/Forms/LinkUtilitiesTests.cs b/src/winforms/src/test/unit/System.Windows.Forms/System/Windows/Forms/LinkUtilitiesTests.cs index 2cdd2cc65b9..3b7d8d098b6 100644 --- a/src/winforms/src/test/unit/System.Windows.Forms/System/Windows/Forms/LinkUtilitiesTests.cs +++ b/src/winforms/src/test/unit/System.Windows.Forms/System/Windows/Forms/LinkUtilitiesTests.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System.Drawing; @@ -44,21 +44,4 @@ public void LinkUtilities_EnsureLinkFonts_CreatesExpectedFonts(LinkBehavior beha linkFont.Should().BeOfType(); hoverLinkFont.Should().BeOfType(); } - - [WinFormsTheory] - [InlineData(LinkBehavior.AlwaysUnderline)] - [InlineData(LinkBehavior.HoverUnderline)] - [InlineData(LinkBehavior.NeverUnderline)] - public void LinkUtilities_EnsureLinkFonts_CreatesExpectedFonts_WithActive(LinkBehavior behavior) - { - using Font baseFont = new("Arial", 12); - Font? linkFont = null; - Font? hoverLinkFont = null; - - Action act = () => LinkUtilities.EnsureLinkFonts(baseFont, behavior, ref linkFont, ref hoverLinkFont, isActive: true); - - act.Should().NotThrow(); - linkFont.Should().BeOfType(); - hoverLinkFont.Should().BeOfType(); - } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy