Skip to content

Fix ComboBox text clipping in NET11 VisualStylesMode #14874

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

Open
LeafShi1 wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −4
Open

Fix ComboBox text clipping in NET11 VisualStylesMode #14874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/System.Windows.Forms/System/Windows/Forms/Controls/ComboBox/ComboBox.Modern.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,8 @@ private ModernComboTargetState ComputeModernComboTargetState()
int bottomInset = chromeInsets.Bottom + Padding.Bottom;
editBounds.Y += topInset;

editBounds.Height = Math.Max(
1,
editBounds.Height - topInset - bottomInset);

// A single-line EDIT control's text visibility depends on its window height.
// Preserve the native height so glyphs are not clipped.
editBounds.Height = Math.Max(
1,
Math.Min(
Expand Down
26 changes: 26 additions & 0 deletions src/test/unit/System.Windows.Forms/System/Windows/Forms/ComboBoxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,32 @@ public void ComboBox_ModernPadding_UpdatesHeightAndEditBounds(
Assert.True(updatedEditBounds.Width < editBounds.Width);
}

[WinFormsTheory]
[InlineData(ComboBoxStyle.DropDown)]
[InlineData(ComboBoxStyle.Simple)]
public void ComboBox_ModernVisualStyles_EditHeightDoesNotClipText(
ComboBoxStyle dropDownStyle)
{
using SystemVisualSettingsTestScope settingsScope = new(
clientAreaAnimationEnabled: false,
highContrastEnabled: false);
using VisualStylesComboBox control = new()
{
DropDownStyle = dropDownStyle,
FlatStyle = FlatStyle.Standard,
Size = dropDownStyle == ComboBoxStyle.Simple
? new Size(140, 100)
: new Size(140, 40),
Text = "Text with descenders: gjpqy",
VisualStylesMode = VisualStylesMode.Net11
};
control.CreateControl();

Assert.True(
control.GetEditBounds().Height
>= control.ModernEditBaseBounds.Height);
}

[WinFormsTheory]
[InlineData(ComboBoxStyle.DropDown)]
[InlineData(ComboBoxStyle.Simple)]
Expand Down
Loading