Skip to content

Place the TabPanel as a child of the TabItem #13964

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −19
Draft

Place the TabPanel as a child of the TabItem #13964

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 ...s.Forms/System/Windows/Forms/Controls/TabControl/TabControl.TabControlAccessibleObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ public override int GetChildCount()

return direction switch
{
NavigateDirection.NavigateDirection_FirstChild => owner.SelectedTab?.AccessibilityObject,
NavigateDirection.NavigateDirection_FirstChild => owner.TabPages.Count > 0
? owner.TabPages[0].TabAccessibilityObject
: null,
NavigateDirection.NavigateDirection_LastChild => owner.TabPages.Count > 0
? owner.TabPages[^1].TabAccessibilityObject
: null,
Expand Down
18 changes: 15 additions & 3 deletions ...tem.Windows.Forms/System/Windows/Forms/Controls/TabControl/TabPage.TabAccessibleObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,24 @@ public override void DoDefaultAction()
return null;
}

int index = OwningTabControl.TabPages.IndexOf(_owningTabPage);
Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

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

The IndexOf operation is called on every navigation request, which could be inefficient for large tab collections. Consider caching the index or using a more efficient lookup mechanism if navigation frequency is high.

Copilot uses AI. Check for mistakes.

return direction switch
{
NavigateDirection.NavigateDirection_Parent => OwningTabControl.AccessibilityObject,
NavigateDirection.NavigateDirection_NextSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() + 1),
NavigateDirection.NavigateDirection_PreviousSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() - 1),
_ => null
NavigateDirection.NavigateDirection_FirstChild =>
index == OwningTabControl.SelectedIndex
? _owningTabPage.AccessibilityObject // Panel
: null,
NavigateDirection.NavigateDirection_NextSibling =>
index < OwningTabControl.TabPages.Count - 1
? OwningTabControl.TabPages[index + 1].TabAccessibilityObject
: null,
NavigateDirection.NavigateDirection_PreviousSibling =>
index > 0
? OwningTabControl.TabPages[index - 1].TabAccessibilityObject
: null,
_ => base.FragmentNavigate(direction)
};
}

Expand Down
23 changes: 8 additions & 15 deletions ...Windows.Forms/System/Windows/Forms/Controls/TabControl/TabPage.TabPageAccessibleObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@ public partial class TabPage
{
internal sealed class TabPageAccessibleObject : ControlAccessibleObject
{
public TabPageAccessibleObject(TabPage owningTabPage) : base(owningTabPage) { }
private readonly TabPage _owningTabPage;

public TabPageAccessibleObject(TabPage owningTabPage) : base(owningTabPage)
{
_owningTabPage = owningTabPage;
}
Comment on lines +14 to +19
Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

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

The private field _owningTabPage duplicates the base class's owner tracking. Consider using the existing TryGetOwnerAs<TabPage>() method or accessing the owner through the base class instead of storing a separate reference.

Copilot uses AI. Check for mistakes.

internal override Rectangle BoundingRectangle => this.IsOwnerHandleCreated(out TabPage? owner) ?
owner.GetPageRectangle() : Rectangle.Empty;

public override AccessibleStates State => SystemIAccessible.TryGetState(GetChildId());

internal override IRawElementProviderFragmentRoot.Interface? FragmentRoot => OwningTabControl?.AccessibilityObject;
internal override IRawElementProviderFragmentRoot.Interface? FragmentRoot => _owningTabPage?.TabAccessibilityObject;

private TabControl? OwningTabControl =>
this.TryGetOwnerAs(out TabPage? owningTabPage) ? owningTabPage.ParentInternal as TabControl : null;
Expand Down Expand Up @@ -52,9 +57,7 @@ public override int GetChildCount()

return direction switch
{
NavigateDirection.NavigateDirection_Parent => OwningTabControl?.AccessibilityObject,
NavigateDirection.NavigateDirection_NextSibling => GetNextSibling(),
NavigateDirection.NavigateDirection_PreviousSibling => null,
NavigateDirection.NavigateDirection_Parent => _owningTabPage?.TabAccessibilityObject,
_ => base.FragmentNavigate(direction)
};
}
Expand All @@ -78,15 +81,5 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
UIA_PATTERN_ID.UIA_ValuePatternId => false,
_ => base.IsPatternSupported(patternId)
};

private TabAccessibleObject? GetNextSibling()
{
if (!this.TryGetOwnerAs(out TabPage? owningTabPage) || OwningTabControl is null || owningTabPage != OwningTabControl.SelectedTab)
{
return null;
}

return OwningTabControl.TabPages.Count > 0 ? OwningTabControl.TabPages[0].TabAccessibilityObject : null;
}
}
}
Loading