Make updateStylesXML() results seamless#17298
Closed
pryrt wants to merge 2 commits intonotepad-plus-plus:masterfrom
Closed
Make updateStylesXML() results seamless#17298pryrt wants to merge 2 commits intonotepad-plus-plus:masterfrom
pryrt wants to merge 2 commits intonotepad-plus-plus:masterfrom
Conversation
- First, implement ozone10 improvements so the WidgetStyles can get their defaults from other existing WidgetStyles, rather than inheriting the model colors
- Second, implement `if(stylers.xml) { use colors from stylers.model.xml } else { use default colors for the active theme }`
Contributor
Author
|
more verification: I used the code from this PR to create the new versions of the themes submitted in #17299 , and they all look reasonable to me, which is another step of verification for this PR. |
donho
requested changes
Dec 15, 2025
Member
donho
left a comment
There was a problem hiding this comment.
Please follow the coding style of project:
PowerEditor/src/Parameters.cpp
Outdated
| const std::wstring& styleID = L"0") -> int | ||
| int result = 0; | ||
| const Style* pStyle = _widgetStyleArray.findByName(name); | ||
| if (pStyle == nullptr) |
pryrt
added a commit
to pryrt/notepad-plus-plus
that referenced
this pull request
Dec 15, 2025
make all themes match stylers.model.xml, per notepad-plus-plus#17298 (comment)
- fix the brace locations - fix the yoda conditionals - remove unneeded stringToLower calls - change ==nullptr and !=nullptr to the truthy equivalents
Contributor
Author
|
Okay, most recent commit to this PR should contain all your code-fix requests. |
donho
approved these changes
Dec 15, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
if(stylers.xml) { use colors from stylers.model.xml } else { use default colors for the active theme }resolves #17289
verification notes
NppParameters::addDefaultStyles()gets correctly used to populate the colors when those specific WidgetStyle elements were missing