Skip to content

Commit 751004f

Browse files
Merge pull request #418 from reduckted/fix-frameshow-enum
[Breaking Changes] Fix FrameShow enum
2 parents ba30676 + 4e04081 commit 751004f

File tree

1 file changed

+83
-17
lines changed
  • src/toolkit/Community.VisualStudio.Toolkit.Shared/Windows

1 file changed

+83
-17
lines changed

src/toolkit/Community.VisualStudio.Toolkit.Shared/Windows/WindowFrame.cs

Lines changed: 83 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public async Task<bool> IsOnScreenAsync()
232232
public async Task<DocumentView?> GetDocumentViewAsync()
233233
{
234234
await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
235-
235+
236236
// Force the loading of a document that may be pending initialization.
237237
// See https://docs.microsoft.com/en-us/visualstudio/extensibility/internals/delayed-document-loading
238238
_frame.GetProperty((int)__VSFPROPID.VSFPROPID_DocView, out _);
@@ -440,31 +440,85 @@ public enum FramePosition
440440
/// <summary>
441441
/// Specifies options when the show state of a window frame changes.
442442
/// </summary>
443-
[Flags]
443+
/// <remarks>
444+
/// This combines the values from
445+
/// <see cref="__FRAMESHOW"/>,
446+
/// <see cref="__FRAMESHOW2"/>,
447+
/// <see cref="__FRAMESHOW3"/> and
448+
/// <see cref="__FRAMESHOW4"/>.
449+
/// </remarks>
444450
public enum FrameShow
445451
{
446-
/// <summary>Reason unknown</summary>
447-
Unknown = 0,
448-
/// <summary>Obsolete; use WinHidden.</summary>
449-
Hidden = __FRAMESHOW.FRAMESHOW_Hidden,
450-
/// <summary>Window (tabbed or otherwise) is hidden.</summary>
451-
WinHidden = __FRAMESHOW.FRAMESHOW_WinHidden,
452-
/// <summary>A nontabbed window is made visible.</summary>
452+
/// <summary>
453+
/// <para>Window (tabbed or otherwise) is hidden.</para>
454+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_WinHidden"/>.</para>
455+
/// </summary>
456+
Hidden = __FRAMESHOW.FRAMESHOW_WinHidden,
457+
/// <summary>
458+
/// <para>A non-tabbed window is made visible.</para>
459+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_WinShown"/>.</para>
460+
/// </summary>
453461
Shown = __FRAMESHOW.FRAMESHOW_WinShown,
454-
/// <summary>A tabbed window is activated (made visible).</summary>
462+
/// <summary>
463+
/// <para>A tabbed window is activated (made visible).</para>
464+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_TabActivated"/>.</para>
465+
/// </summary>
455466
TabActivated = __FRAMESHOW.FRAMESHOW_TabActivated,
456-
/// <summary>A tabbed window is deactivated.</summary>
467+
/// <summary>
468+
/// <para>A tabbed window is deactivated.</para>
469+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_TabDeactivated"/>.</para>
470+
/// </summary>
457471
TabDeactivated = __FRAMESHOW.FRAMESHOW_TabDeactivated,
458-
/// <summary>Window is restored to normal state.</summary>
472+
/// <summary>
473+
/// <para>Window is restored to normal state.</para>
474+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_WinRestored"/>.</para>
475+
/// </summary>
459476
Restored = __FRAMESHOW.FRAMESHOW_WinRestored,
460-
/// <summary>Window is minimized.</summary>
477+
/// <summary>
478+
/// <para>Window is minimized.</para>
479+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_WinMinimized"/>.</para>
480+
/// </summary>
461481
Minimized = __FRAMESHOW.FRAMESHOW_WinMinimized,
462-
/// <summary>Window is maximized.</summary>
482+
/// <summary>
483+
/// <para>Window is maximized.</para>
484+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_WinMaximized"/>.</para>
485+
/// </summary>
463486
Maximized = __FRAMESHOW.FRAMESHOW_WinMaximized,
464-
/// <summary>Multi-instance tool window destroyed.</summary>
487+
/// <summary>
488+
/// <para>Multi-instance tool window destroyed.</para>
489+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_DestroyMultInst"/>.</para>
490+
/// </summary>
465491
DestroyMultipleInstance = __FRAMESHOW.FRAMESHOW_DestroyMultInst,
466-
/// <summary>Autohidden window is about to slide into view.</summary>
467-
AutoHideSlideBegin = __FRAMESHOW.FRAMESHOW_AutoHideSlideBegin
492+
/// <summary>
493+
/// <para>Auto-hidden window is about to slide into view.</para>
494+
/// <para>Equivalent to <see cref="__FRAMESHOW.FRAMESHOW_AutoHideSlideBegin"/>.</para>
495+
/// </summary>
496+
AutoHideSlideBegin = __FRAMESHOW.FRAMESHOW_AutoHideSlideBegin,
497+
/// <summary>
498+
/// <para>A window is about to be hidden.</para>
499+
/// <para>Equivalent to <see cref="__FRAMESHOW2.FRAMESHOW_BeforeWinHidden"/>.</para>
500+
/// </summary>
501+
BeforeHidden = __FRAMESHOW2.FRAMESHOW_BeforeWinHidden,
502+
/// <summary>
503+
/// <para>Auto-hidden window is finished sliding into view.</para>
504+
/// <para>Equivalent to <see cref="__FRAMESHOW2.FRAMESHOW_AutoHideSlideEnd"/>.</para>
505+
/// </summary>
506+
AutoHideSlideEnd = __FRAMESHOW2.FRAMESHOW_AutoHideSlideEnd,
507+
/// <summary>
508+
/// <para>A window is activated (made visible).</para>
509+
/// <para>Equivalent to <see cref="__FRAMESHOW3.FRAMESHOW_WinActivated"/>.</para>
510+
/// </summary>
511+
Activated = __FRAMESHOW3.FRAMESHOW_WinActivated,
512+
/// <summary>
513+
/// <para>The window's inner content received keyboard focus.</para>
514+
/// <para>Equivalent to <see cref="__FRAMESHOW4.FRAMESHOW_WinContentGotFocus"/>.</para>
515+
/// </summary>
516+
ContentGotFocus = __FRAMESHOW4.FRAMESHOW_WinContentGotFocus,
517+
/// <summary>
518+
/// <para>The window's inner content lost keyboard focus.</para>
519+
/// <para>Equivalent to <see cref="__FRAMESHOW4.FRAMESHOW_WinContentLostFocus"/>.</para>
520+
/// </summary>
521+
ContentLostFocus = __FRAMESHOW4.FRAMESHOW_WinContentLostFocus
468522
}
469523

470524
/// <summary>
@@ -551,4 +605,16 @@ public WindowFrameDockChangedEventArgs(Rectangle position, bool docked)
551605
Docked = docked;
552606
}
553607
}
608+
609+
610+
#if VS14
611+
/// <summary>
612+
/// __FRAMESHOW4 was first defined in Visual Studio 15.
613+
/// </summary>
614+
internal enum __FRAMESHOW4
615+
{
616+
FRAMESHOW_WinContentGotFocus = 13,
617+
FRAMESHOW_WinContentLostFocus
618+
}
619+
#endif
554620
}

0 commit comments

Comments
 (0)