[PR #2065] [MERGED] Switch away from OS version detection for DirectWrite things #24787

Open
opened 2026-01-31 09:05:20 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/2065
Author: @fcharlie
Created: 7/22/2019
Status: Merged
Merged: 7/24/2019
Merged by: @DHowett-MSFT

Base: masterHead: non_osver_detect


📝 Commits (8)

  • 11474ca The osver needs to be detected only when EXTERNAL_BUILD is turned on.
  • f65848f If IDWriteTextFormat1 does not exist, return directly
  • 090c148 CustomTextLayout code format
  • d99e0b9 Update src/renderer/dx/CustomTextLayout.cpp
  • cd01c8a Update src/renderer/dx/CustomTextLayout.cpp
  • 6351d21 Update src/renderer/dx/CustomTextLayout.cpp
  • 98f6b55 Update src/renderer/dx/CustomTextLayout.cpp
  • 32f8860 We use DXGI_SCALING_NONE create SwapChain first, if failed switch to DXGI_SCALING_STRETCH

📊 Changes

3 files changed (+26 additions, -26 deletions)

View changed files

📝 .vsconfig (+3 -3)
📝 src/renderer/dx/CustomTextLayout.cpp (+6 -7)
📝 src/renderer/dx/DxRenderer.cpp (+17 -16)

📄 Description

Summary of the Pull Request

DX rendering only needs to detect the operating system version when EXTERNAL_BUILD is turned on. For Windows building, the target Windows is almost considered to be the latest.

References

PR Checklist

  • (incidentally closes #2069)
  • 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

Validation Steps Performed


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/2065 **Author:** [@fcharlie](https://github.com/fcharlie) **Created:** 7/22/2019 **Status:** ✅ Merged **Merged:** 7/24/2019 **Merged by:** [@DHowett-MSFT](https://github.com/DHowett-MSFT) **Base:** `master` ← **Head:** `non_osver_detect` --- ### 📝 Commits (8) - [`11474ca`](https://github.com/microsoft/terminal/commit/11474ca769411fcc22cdeb24163b96c2fe940942) The osver needs to be detected only when EXTERNAL_BUILD is turned on. - [`f65848f`](https://github.com/microsoft/terminal/commit/f65848fbff5d55a03ea13a4ff9d37d8356f97742) If IDWriteTextFormat1 does not exist, return directly - [`090c148`](https://github.com/microsoft/terminal/commit/090c148cbbd656abbc0fec0994b2d58b41477e8c) CustomTextLayout code format - [`d99e0b9`](https://github.com/microsoft/terminal/commit/d99e0b91874027b7dde3ab46b1d2eb3a91ab8eb6) Update src/renderer/dx/CustomTextLayout.cpp - [`cd01c8a`](https://github.com/microsoft/terminal/commit/cd01c8a53938b7a5229c264972f3ddddde132b62) Update src/renderer/dx/CustomTextLayout.cpp - [`6351d21`](https://github.com/microsoft/terminal/commit/6351d21b95acdf2e5e508188c9dd791716182d1c) Update src/renderer/dx/CustomTextLayout.cpp - [`98f6b55`](https://github.com/microsoft/terminal/commit/98f6b55ee6c482e66e6bb1162547fb8cd094e1f6) Update src/renderer/dx/CustomTextLayout.cpp - [`32f8860`](https://github.com/microsoft/terminal/commit/32f88606a7f12832fba54d61e92023fc4ebd85ce) We use DXGI_SCALING_NONE create SwapChain first, if failed switch to DXGI_SCALING_STRETCH ### 📊 Changes **3 files changed** (+26 additions, -26 deletions) <details> <summary>View changed files</summary> 📝 `.vsconfig` (+3 -3) 📝 `src/renderer/dx/CustomTextLayout.cpp` (+6 -7) 📝 `src/renderer/dx/DxRenderer.cpp` (+17 -16) </details> ### 📄 Description <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request DX rendering only needs to detect the operating system version when EXTERNAL_BUILD is turned on. For Windows building, the target Windows is almost considered to be the latest. <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [x] (incidentally closes #2069) * [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) 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 <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:05:20 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#24787