Skip to content
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.

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

Fix missing window border when use "win+arrow down" in fullscreen mode in Terminal #11653

Merged
1 commit merged into from
Nov 4, 2021

Conversation

serd2011
Copy link
Contributor

@serd2011 serd2011 commented Oct 29, 2021

Window sends an event that requests exit from fullscreen then SC_RESTORE messages is sent and it is in fullscreen mode.
Closes #10607

Validation Steps Performed

Border and tabbar now appear after exiting fullscreen via "win+arrow down".

@ghost ghost added Area-User Interface Issues pertaining to the user interface of the Console or Terminal Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-3 A description (P3) Product-Conhost For issues in the Console codebase Product-Terminal The new Windows Terminal. labels Oct 29, 2021
Copy link
Member

@zadjii-msft zadjii-msft left a comment

Choose a reason for hiding this comment

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

Wild. Makes sense to me. Thanks for doing this!

@zadjii-msft zadjii-msft added the Needs-Second It's a PR that needs another sign-off label Nov 4, 2021
@DHowett
Copy link
Member

DHowett commented Nov 4, 2021

This PR only fixes Terminal, not conhost. Should open new issue for conhost or add stage for this one.

If you want to send another PR, that would be best! Conhost changes are easier to review in isolation :)

Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

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

This is great. Thank you!

@DHowett DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Nov 4, 2021
@ghost
Copy link

ghost commented Nov 4, 2021

Hello @DHowett!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 7aae2e9 into microsoft:main Nov 4, 2021
@serd2011 serd2011 deleted the 10607 branch November 5, 2021 03:19
@krzysdz
Copy link
Contributor

krzysdz commented Nov 5, 2021

This PR causes build errors, because, when combined with #11404, WM_SYSCOMMAND case value is used twice. The problem is here (lines 609 and 623):

case WM_SYSCOMMAND:
{
if (wparam == SC_RESTORE && _fullscreen)
{
_ShouldExitFullscreenHandlers();
return 0;
}
break;
}
case WM_MENUCOMMAND:
{
_NotifyNotificationIconMenuItemSelectedHandlers((HMENU)lparam, (UINT)wparam);
return 0;
}
case WM_SYSCOMMAND:
{
auto search = _systemMenuItems.find(LOWORD(wparam));
if (search != _systemMenuItems.end())
{
search->second.callback();
}
break;
}

ghost pushed a commit that referenced this pull request Nov 5, 2021
#11404 and #11653 both added WM_SYSCOMMAND which prevents build. This fixes it.
DHowett pushed a commit that referenced this pull request Dec 13, 2021
…e in Terminal (#11653)

Window sends an event that requests exit from fullscreen then SC_RESTORE messages is sent and it is in fullscreen mode.
Closes #10607

Border and tabbar now appear after exiting fullscreen via "win+arrow down".

(cherry picked from commit 7aae2e9)
DHowett pushed a commit that referenced this pull request Dec 13, 2021
…e in Terminal (#11653)

Window sends an event that requests exit from fullscreen then SC_RESTORE messages is sent and it is in fullscreen mode.
Closes #10607

## Validation Steps Performed
Border and tabbar now appear after exiting fullscreen via "win+arrow down".

(cherry picked from commit 7aae2e9)
@ghost
Copy link

ghost commented Dec 14, 2021

🎉Windows Terminal Preview v1.12.3472.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost
Copy link

ghost commented Dec 14, 2021

🎉Windows Terminal v1.11.3471.0 has been released which incorporates this pull request.:tada:

Handy links:

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-User Interface Issues pertaining to the user interface of the Console or Terminal AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Needs-Second It's a PR that needs another sign-off Priority-3 A description (P3) Product-Conhost For issues in the Console codebase Product-Terminal The new Windows Terminal.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Window border not present after restoring from maximised fullscreen
4 participants