Apply a GDI region to the top level Island window to allow dragging with a single Xaml Island by ocalvo · Pull Request #929 · microsoft/terminal

ocalvo · 2019-05-21T22:26:02Z

Summary of the Pull Request

When Terminal is drawing in the non client area we no longer create 2 islands. Instead we create a single island and create a region that "pokes" the drag-able title bar area in the top right corner of the main window of terminal.

This change also fixes:

A crash at shutdown where the Application object is released early.
DestroyWindow is not getting called at shutdown for the all HWND (This have the effect of showing the window for a brief period after closing the app)
WindowsDesktopXamlSource.Close was not getting called at shutdown.

References

PR Checklist

Closes 872, 1085
CLA signed. If not, go over here and sign the CLA
Tests added/passed
Requires documentation to be updated
I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

miniksa

Is there a visual difference when changing this? Like does it remove the pixel gap between the islands or the frame? Or is it just the drag area?

Can you MSPaint on a screenshot what the difference is so we can visualize it more easily?

src/cascadia/WindowsTerminal/AppHost.cpp

src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp

Co-Authored-By: Michael Niksa <[email protected]>

src/cascadia/TerminalApp/App.cpp

src/cascadia/TerminalApp/App.h

src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp

src/cascadia/TerminalApp/App.cpp

src/cascadia/TerminalApp/App.idl

src/cascadia/WindowsTerminal/AppHost.cpp

DHowett-MSFT · 2019-05-31T20:38:13Z

/azp run

DHowett-MSFT · 2019-05-31T21:16:03Z

/azp run

DHowett-MSFT

I'm comfortable with this. I just need a second signoff to merge it.

Outdated.

src/cascadia/TerminalApp/App.xaml

src/cascadia/WindowsTerminal/BaseWindow.h

src/cascadia/WindowsTerminal/pch.h

Poopooracoocoo · 2019-06-28T10:18:57Z

kinda odd how the borders at the top are rounded. Very few apps have rounded borders on Windows 10. One is Math Input Panel.

Stanzilla · 2019-06-28T14:56:35Z

They already said this will change in the future, Windows is getting rounded borders everywhere

Poopooracoocoo · 2019-06-28T22:54:01Z

Introducing rounded corners after years of persistent sharp corners is hard and we don't have rounded corners right now anyway. I got a little off topic as it's more of a topic for the winui repo

DHowett-MSFT · 2019-06-29T00:50:40Z

The real technical reason this is happening is that we're suppressing window decorations and drawing over them, and the kernel component in charge of that (don't ask) gives us a region with rounded corners.
If we let the kernel do the painting, it looks like Windows Vista's Aero Basic.
Hence, the rounded corners.

…ith a single Island (microsoft#929) * Use a region to cut off the dragable region * Use proper measurements for the draggable area * Working better, paint works most of the time * Fix a bug where paint is incomplete when double clicking the dragbar * Remove old fork on XamlApplication * Upgrade to XamlApp preview6.2 * Add Microsoft.VCRTForwarders to make it easy to dogfood Co-Authored-By: Michael Niksa <[email protected]> Co-Authored-By: Mike Griese <[email protected]>

ghost · 2019-08-03T01:49:30Z

🎉Windows Terminal Preview v0.3.2142.0 has been released which incorporates this pull request.:tada:

Handy links:

ocalvo added 5 commits May 21, 2019 15:17

Use a region to cut off the dragable region

2c7e4e8

It works

d1af4bd

Adjust Slipt button for Title Bar

7b34187

Use proper measurements for the draggable area

80c6b93

Remove dead code

d56afcf

miniksa reviewed May 22, 2019

View reviewed changes

miniksa added Area-UserInterface Issues pertaining to the user interface of the Console or Terminal Issue-Task It's a feature request, but it doesn't really need a major design. Product-Terminal The new Windows Terminal. labels May 22, 2019

miniksa added this to the Terminal v1.0 milestone May 22, 2019

ocalvo and others added 2 commits May 22, 2019 11:19

Update src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp

567a833

Co-Authored-By: Michael Niksa <[email protected]>

Update src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp

dc8213c

Co-Authored-By: Michael Niksa <[email protected]>

zadjii-msft reviewed May 22, 2019

View reviewed changes

src/cascadia/TerminalApp/App.cpp Outdated Show resolved Hide resolved

src/cascadia/TerminalApp/App.h Outdated Show resolved Hide resolved

ocalvo added 5 commits May 22, 2019 11:35

Apply PR feedback

6a7ea45

Apply PR feedback

fab0bc8

Fix build break ARM64

0d34b8f

Merge branch 'master' of https://github.com/microsoft/terminal

59260b1

Merge branch 'master' of https://github.com/microsoft/terminal

754e843

zadjii-msft requested changes May 30, 2019

View reviewed changes

ghost added Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something and removed Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something labels May 30, 2019

ocalvo added 6 commits May 30, 2019 12:49

Something working

14a8604

Merge branch 'master' of https://github.com/microsoft/terminal

8dabdb0

Apply PR feedback

cd9185d

Remove comment

163b37c

Add comment

de9cbfa

Merge branch 'master' of https://github.com/ocalvo/terminal into NCPaint

d3fb2a6

microsoft deleted a comment from azure-pipelines bot May 31, 2019

ocalvo added 3 commits June 24, 2019 12:33

Apply PR feedback

c6703c3

Fix build break (but not sure why or how)

2c3fd76

Fix build break in ARM64

18dfcf4

DHowett-MSFT approved these changes Jun 25, 2019

View reviewed changes

Add Microsoft.VCRTForwarders to make it easy to dogfood

db846ba

DHowett-MSFT reviewed Jun 25, 2019

View reviewed changes

src/cascadia/TerminalApp/App.xaml Outdated Show resolved Hide resolved

src/cascadia/WindowsTerminal/BaseWindow.h Outdated Show resolved Hide resolved

src/cascadia/WindowsTerminal/pch.h Outdated Show resolved Hide resolved

carlos-zamora approved these changes Jun 25, 2019

View reviewed changes

ocalvo added 3 commits June 25, 2019 10:36

Apply PR feedback

f9a311c

App,ly PR feedback

fdf0962

Fix code format

e704ace

cinnamon-msft assigned ocalvo Jun 25, 2019

miniksa approved these changes Jun 25, 2019

View reviewed changes

DHowett-MSFT merged commit ab08320 into microsoft:master Jun 25, 2019

jmorrill mentioned this pull request Jun 27, 2019

Resize performance bad since pr #929 #1681

Closed

cpbotha mentioned this pull request Jun 28, 2019

Terminal shows an empty window and then crashes #1364

Closed

cinnamon-msft mentioned this pull request Jul 2, 2019

Feature Request: The Terminal window's resize border is too small #1138

Closed

This was referenced Jul 8, 2019

Window border width does not respect system theme #1859

Closed

Move most of TerminalApp's runtime Xaml to a .xaml file and class #1885

Merged

This was referenced Jul 9, 2019

Don't NCPAINT our window, PAINT our window #1898

Merged

Bug Report: Dark Theme requires settings reload #1913

Closed

Add a setting to enable the using the Accent Color for the titlebar #1963

Closed

beviu mentioned this pull request Oct 30, 2019

Fix tab row doesn't grow #3347

Closed

5 tasks

Conversation

ocalvo commented May 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

References

PR Checklist

Detailed Description of the Pull Request / Additional comments

Uh oh!

miniksa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT commented May 31, 2019

Uh oh!

DHowett-MSFT commented May 31, 2019

Uh oh!

DHowett-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Poopooracoocoo commented Jun 28, 2019

Uh oh!

Stanzilla commented Jun 28, 2019

Uh oh!

Poopooracoocoo commented Jun 28, 2019

Uh oh!

DHowett-MSFT commented Jun 29, 2019

Uh oh!

ghost commented Aug 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

ocalvo commented May 21, 2019 •

edited

Loading