Skip to content

Fix a bug introduced in the DesignerActionPanel refactoring #10123

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

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Fix a bug introduced in the DesignerActionPanel refactoring #10123

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
4 changes: 3 additions & 1 deletion ...Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.CheckBoxPropertyLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ protected override void OnValueChanged()
_checkBox.Checked = (bool)Value;
}

public sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);

private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
{
public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
{
Expand Down
4 changes: 3 additions & 1 deletion ...s.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.EditorPropertyLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,9 @@ protected override bool ProcessDialogKey(Keys keyData)
}
}

public new sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
public static new StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);

private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
{
public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
{
Expand Down
5 changes: 3 additions & 2 deletions ...m.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.HeaderLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ private HeaderLine(IServiceProvider serviceProvider, DesignerActionPanel actionP

protected override Font GetFont() => new(ActionPanel.Font, FontStyle.Bold);

public new sealed class Info(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)
public static new StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionTextItem item) => new HeaderTextLineInfo(list, item);

private sealed class HeaderTextLineInfo(DesignerActionList list, DesignerActionTextItem item) : TextLineInfo(list, item)
Copy link
Contributor Author

@halgab halgab Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the crux of the fix. HeaderInfo (formerly HeaderLine.Info) needs to be of type TextLineInfo (formerly TextLine.Info) because otherwise HeaderInfo.UpdateActionItem crashes as it cannot cast the LineInfo object

{
public override DesignerActionTextItem Item { get; } = item;
public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
{
return new HeaderLine(serviceProvider, actionPanel);
Expand Down
3 changes: 2 additions & 1 deletion ...m.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.MethodLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ protected override bool ProcessDialogKey(Keys keyData)
}
}

public sealed class Info(DesignerActionList list, DesignerActionMethodItem item) : StandardLineInfo(list)
public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionMethodItem item) => new Info(list, item);
private sealed class Info(DesignerActionList list, DesignerActionMethodItem item) : StandardLineInfo(list)
{
public override DesignerActionMethodItem Item { get; } = item;
public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
Expand Down
2 changes: 1 addition & 1 deletion ...Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.PropertyLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ internal sealed override void UpdateActionItem(LineInfo lineInfo, ToolTip toolTi
}
}

public abstract class PropertyLineInfo(DesignerActionList list, DesignerActionPropertyItem item) : StandardLineInfo(list)
protected abstract class PropertyLineInfo(DesignerActionList list, DesignerActionPropertyItem item) : StandardLineInfo(list)
{
public override DesignerActionPropertyItem Item { get; } = item;
}
Expand Down
4 changes: 3 additions & 1 deletion ....Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextBoxPropertyLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ public EditorLabelAccessibleObject(EditorLabel owner)
}
}

public sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionPropertyItem item) => new Info(list, item);

private sealed class Info(DesignerActionList list, DesignerActionPropertyItem item) : PropertyLineInfo(list, item)
{
public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
{
Expand Down
8 changes: 5 additions & 3 deletions ...tem.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.TextLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,17 @@ protected virtual Font GetFont()

internal override void UpdateActionItem(LineInfo lineInfo, ToolTip toolTip, ref int currentTabIndex)
{
Info info = (Info)lineInfo;
_textItem = info.Item;
TextLineInfo textLineInfo = (TextLineInfo)lineInfo;
_textItem = textLineInfo.Item;
_label.Text = StripAmpersands(_textItem.DisplayName);
_label.Font = GetFont();
_label.TabIndex = currentTabIndex++;
toolTip.SetToolTip(_label, _textItem.Description);
}

public sealed class Info(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)
public static StandardLineInfo CreateLineInfo(DesignerActionList list, DesignerActionTextItem item) => new TextLineInfo(list, item);

protected class TextLineInfo(DesignerActionList list, DesignerActionTextItem item) : StandardLineInfo(list)
{
public override DesignerActionTextItem Item { get; } = item;
public override Line CreateLine(IServiceProvider serviceProvider, DesignerActionPanel actionPanel)
Expand Down
16 changes: 8 additions & 8 deletions src/System.Windows.Forms.Design/src/System/ComponentModel/Design/DesignerActionPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ private StandardLineInfo ProcessTaskItem(DesignerActionList list, DesignerAction
{
if (item is DesignerActionMethodItem methodItem)
{
return new MethodLine.Info(list, methodItem);
return MethodLine.CreateLineInfo(list, methodItem);
}
else if (item is DesignerActionPropertyItem pti)
{
Expand All @@ -675,37 +675,37 @@ private StandardLineInfo ProcessTaskItem(DesignerActionList list, DesignerAction
bool standardValuesSupported = pd.Converter.GetStandardValuesSupported(context);
if (pd.TryGetEditor(out UITypeEditor _))
{
return new EditorPropertyLine.Info(list, pti);
return EditorPropertyLine.CreateLineInfo(list, pti);
}
else if (pd.PropertyType == typeof(bool))
{
if (IsReadOnlyProperty(pd))
{
return new TextBoxPropertyLine.Info(list, pti);
return TextBoxPropertyLine.CreateLineInfo(list, pti);
}
else
{
return new CheckBoxPropertyLine.Info(list, pti);
return CheckBoxPropertyLine.CreateLineInfo(list, pti);
}
}
else if (standardValuesSupported)
{
return new EditorPropertyLine.Info(list, pti);
return EditorPropertyLine.CreateLineInfo(list, pti);
}
else
{
return new TextBoxPropertyLine.Info(list, pti);
return TextBoxPropertyLine.CreateLineInfo(list, pti);
}
}
else if (item is DesignerActionTextItem textItem)
{
if (item is DesignerActionHeaderItem)
{
return new HeaderLine.Info(list, textItem);
return HeaderLine.CreateLineInfo(list, textItem);
}
else
{
return new TextLine.Info(list, textItem);
return TextLine.CreateLineInfo(list, textItem);
}
}
else
Expand Down