Add `doubleUnderscore` cursor style #7827

rhorber · 2020-10-05T11:48:48Z

Adds a new cursor type "doubleUnderscore". Tested manually.

src/renderer/dx/CustomTextRenderer.cpp

To draw the double underscore cursor draw the upper line directly. For this, I moved the initialisation of brush up to the paintType.

rhorber · 2020-10-23T05:56:01Z

As far as I know all necessary changes are made and to put it "on radar" I marked the PR "Ready for review".

src/renderer/gdi/paint.cpp

src/renderer/dx/CustomTextRenderer.cpp

src/inc/conattrs.hpp

miniksa · 2020-10-28T21:25:36Z

src/renderer/dx/CustomTextRenderer.cpp

+        upperLine.top -= 2;
+        upperLine.bottom -= 2;


Does this look correct at all DPIs or does it need to be adjusted by a scale factor?

I switched "Custom scaling" to 200% in the settings. Is this the correct/preferred procedure?

Single underline is IMHO also thin:

And double underscore for comparison:

(Clicking the images helps.)

I'm open whether to scale or not to scale 😊

Oof, can you file a follow on issue (or search the repo for an existing one) to make sure these things get scaled? I bet its just 1px and it looks bad for all options.

Hm, I couldn't find one on searching. Maybe my boolean-fu is bad. @j4james this might be a thing you know about? I don't know why I think that... but something rings a bell in my head that you might have noticed cursors aren't DPI scaled...

No. I was looking at the grid line rendering (underlines, overlines, etc.). Those do now track the font style and also scale appropriately, but I don't think the cursors do (at least not all of them).

src/renderer/gdi/paint.cpp

Because the doubleUnderscore cursor directly draws a line, the color needs to be set before the switch. Otherwise one line would be white.

zadjii-msft

I'm okay with this because the DX code looks good, and the GDI code is technically unreachable, so I'm not really worried about how that looks.

src/renderer/gdi/paint.cpp

zadjii-msft · 2020-11-17T13:52:35Z

@rhorber heads up, this merge-conflicted in TerminalSettingsSerializationHelpers, but I really doubt the conflict will be that hard to resolve...

miniksa · 2020-12-03T23:19:11Z

I just want to get a bit of closure on whether we need to file a follow on for cursor shape scaling or if there's an existing one. Then I guess there's no sense on standing in the way of this any further.

zadjii-msft · 2021-01-19T22:25:44Z

The merge conflict here should be trivial, but I don't trust myself with git to push the fix to someone else's fork.

@DHowett would you mind resolving this and merging it? Or @rhorber you could too and get it merged faster ☺️

DHowett

Thank you for doing this. I've updated the value for the settings UI, as well, and changed the order of the enum values so that they show up nicely.

ghost · 2021-01-20T02:09:06Z

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.

DHowett · 2021-01-20T02:12:42Z

I apologize for us taking so long to get to this. Sometimes, quick wins from our community slip through the cracks. I'm making sure this goes out in 1.6. 😄

rhorber · 2021-01-27T08:01:26Z

I apologize too for not responding. 😔 (I had some busy months and was not on GitHub for work either.)

I am very happy I could help.

If it's okay, I will sometimes check the open issues if there is something I can do (and is not time critical 😆).

DHowett · 2021-01-27T08:03:06Z

You’re very welcome to do that! Thanks again!

Adds a new cursor type "doubleUnderscore". Tested manually. Closes microsoft#6786

rhorber added 4 commits October 5, 2020 13:22

Add new cursor type

8564631

Implement doubleUnderscore in DxRenderer

0280912

Implement doubleUnderscore in GDI renderer

2abed28

doc: Add new cursor type doubleUnderscore

02b543c

zadjii-msft requested changes Oct 5, 2020

View reviewed changes

src/renderer/dx/CustomTextRenderer.cpp Outdated Show resolved Hide resolved

ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Oct 5, 2020

zadjii-msft changed the title ~~Feature/issue 6786~~ Add doubleUnderscore cursor style Oct 5, 2020

Remove paint type HorizontalOnly in DxRenderer

135dca3

To draw the double underscore cursor draw the upper line directly. For this, I moved the initialisation of brush up to the paintType.

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Oct 6, 2020

rhorber requested a review from zadjii-msft October 6, 2020 05:55

rhorber mentioned this pull request Oct 6, 2020

Add docs for double underscore cursor MicrosoftDocs/terminal#153

Merged

microsoft-github-updates bot changed the base branch from master to main October 22, 2020 00:27

rhorber marked this pull request as ready for review October 23, 2020 05:56

vadimkantorov reviewed Oct 25, 2020

View reviewed changes

src/renderer/gdi/paint.cpp Show resolved Hide resolved

Add missing break in GDI renderer

1935145

miniksa requested changes Oct 28, 2020

View reviewed changes

ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Oct 28, 2020

zadjii-msft assigned rhorber Oct 28, 2020

Move setting cursor color befor cursorType switch

047c554

Because the doubleUnderscore cursor directly draws a line, the color needs to be set before the switch. Otherwise one line would be white.

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Nov 4, 2020

zadjii-msft approved these changes Nov 5, 2020

View reviewed changes

src/renderer/gdi/paint.cpp Show resolved Hide resolved

zadjii-msft assigned miniksa and unassigned rhorber Nov 5, 2020

zadjii-msft assigned rhorber and unassigned miniksa Nov 17, 2020

zadjii-msft assigned miniksa Nov 17, 2020

miniksa 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 Dec 17, 2020

miniksa approved these changes Jan 11, 2021

View reviewed changes

zadjii-msft assigned DHowett and unassigned miniksa Jan 19, 2021

DHowett added 2 commits January 19, 2021 18:01

Merge remote-tracking branch 'origin/main' into HEAD

1063141

Reorder entries and add localization

1c8ef3b

DHowett approved these changes Jan 20, 2021

View reviewed changes

DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jan 20, 2021

ghost merged commit b7a7aa0 into microsoft:main Jan 20, 2021

cinnamon-msft mentioned this pull request Jan 22, 2021

Add remaining 1.6 release features MicrosoftDocs/terminal#223

Closed

15 tasks

rhorber deleted the feature/issue-6786 branch January 27, 2021 08:01

mpela81 pushed a commit to mpela81/terminal that referenced this pull request Jan 28, 2021

Add doubleUnderscore cursor style (microsoft#7827)

92752bd

Adds a new cursor type "doubleUnderscore". Tested manually. Closes microsoft#6786

j4james mentioned this pull request Jul 22, 2023

[megathread] Cursor shapes in WT UI / conhost UI / VT #15746

Open

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `doubleUnderscore` cursor style #7827

Add `doubleUnderscore` cursor style #7827

rhorber commented Oct 5, 2020 •

edited by DHowett

Loading

rhorber commented Oct 23, 2020

miniksa Oct 28, 2020

rhorber Nov 4, 2020

miniksa Dec 3, 2020

miniksa Dec 3, 2020

j4james Dec 3, 2020

zadjii-msft left a comment

zadjii-msft commented Nov 17, 2020

miniksa commented Dec 3, 2020

zadjii-msft commented Jan 19, 2021

DHowett left a comment

ghost commented Jan 20, 2021

DHowett commented Jan 20, 2021

rhorber commented Jan 27, 2021

DHowett commented Jan 27, 2021

Add doubleUnderscore cursor style #7827

Add doubleUnderscore cursor style #7827

Conversation

rhorber commented Oct 5, 2020 • edited by DHowett Loading

rhorber commented Oct 23, 2020

miniksa Oct 28, 2020

Choose a reason for hiding this comment

rhorber Nov 4, 2020

Choose a reason for hiding this comment

miniksa Dec 3, 2020

Choose a reason for hiding this comment

miniksa Dec 3, 2020

Choose a reason for hiding this comment

j4james Dec 3, 2020

Choose a reason for hiding this comment

zadjii-msft left a comment

Choose a reason for hiding this comment

zadjii-msft commented Nov 17, 2020

miniksa commented Dec 3, 2020

zadjii-msft commented Jan 19, 2021

DHowett left a comment

Choose a reason for hiding this comment

ghost commented Jan 20, 2021

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.

DHowett commented Jan 20, 2021

rhorber commented Jan 27, 2021

DHowett commented Jan 27, 2021

Add `doubleUnderscore` cursor style #7827

Add `doubleUnderscore` cursor style #7827

rhorber commented Oct 5, 2020 •

edited by DHowett

Loading

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.