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

[SHELL32] Remove redundant WS_TABSTOP from some controls #6917

Closed
wants to merge 1 commit into from

Conversation

maj113
Copy link
Contributor

@maj113 maj113 commented May 20, 2024

Purpose

Some controls already specify WS_TABSTOP when no other Window Style is specified

addendum to 7ce96fd

JIRA issue: N/A

Proposed changes

  • Remove WS_TABSTOP from some controls (some still require it because they don't specify it by default)

NOTE

Used regex for this:

Get-ChildItem -Path . -Filter *.rc | ForEach-Object { (Get-Content -Path $_.FullName) | ForEach-Object { if ($_ -match '^(?!.*GROUPBOX).*?,\s*WS_TABSTOP$') { $_ -replace ',\s*WS_TABSTOP$', '' } else { $_ } } | Set-Content -Path $_.FullName }

GROUPBOX for example doesn't have a WS_TABSTOP by default so it's excluded.

@github-actions github-actions bot added the shell All PR's related to the shell (and shell extensions) label May 20, 2024
Copy link
Contributor

@JoachimHenze JoachimHenze left a comment

Choose a reason for hiding this comment

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

I requested you to wait for 2 weeks with that. This PR does with almost certainty collide with at least 1 (more likely 2) of the already existing shell32-rc-PRs. Please wait until those will be merged and then resolve the merge conflicts afterwards.

@maj113
Copy link
Contributor Author

maj113 commented May 21, 2024

I requested you to wait for 2 weeks with that. This PR does with almost certainty collide with at least 1 (more likely 2) of the already existing shell32-rc-PRs. Please wait until those will be merged and then resolve the merge conflicts afterwards.

My bad, I did not see that comment since it did not mention me and at the time was already hidden

@binarymaster binarymaster added the bugfix For bugfix PRs. label May 21, 2024
@binarymaster binarymaster added this to New PRs in ReactOS PRs via automation May 21, 2024
@binarymaster binarymaster moved this from New PRs to WIP / Waiting on contributor in ReactOS PRs May 21, 2024
@JoachimHenze
Copy link
Contributor

JoachimHenze commented May 22, 2024

Okay, the 2 PRs have been merged now. Since you created those changes with your script, it is most likely the safest if I just close this PR, and you reopen a fresh one where you rerun your script on most up-to-date master head. This is safer than trying to resolve the merge-conflicts in here. Still many thanks for your work, I do appreciate your plan and changes.

I will keep my hands off any lines which do contain WS_TABSTOP meanwhile for a while. Promised.

ReactOS PRs automation moved this from WIP / Waiting on contributor to Done May 22, 2024
@binarymaster
Copy link
Member

Why not just force push?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix For bugfix PRs. shell All PR's related to the shell (and shell extensions)
Projects
ReactOS PRs
  
Done
3 participants