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

Ensure identify highlight works for very transparent symbols #54864

Merged
merged 4 commits into from Oct 9, 2023

Conversation

nyalldawson
Copy link
Collaborator

When mapping color for rendering highlighted (identified) features, don't allow pixels which were previously non-transparent to become totally transparent.

This can result in invisible highlights for very transparent symbols.

Fixes #54830

@github-actions github-actions bot added this to the 3.34.0 milestone Oct 6, 2023
don't allow pixels which were previously non-transparent to become
totally transparent.

This can result in invisible highlights for very transparent symbols.

Fixes qgis#54830
@nyalldawson nyalldawson merged commit 79b4353 into qgis:master Oct 9, 2023
29 checks passed
@nyalldawson nyalldawson deleted the fix_54830 branch October 9, 2023 03:02
@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 9, 2023

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1758684935... Cleanup and modernize QgsHighlight test
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging src/gui/qgshighlight.cpp
[backport-54864-to-queued_ltr_backports b842f2cf69] When mapping color for rendering highlighted (identified) features, don't allow pixels which were previously non-transparent to become totally transparent.
 Author: Nyall Dawson <nyall.dawson@gmail.com>
 Date: Fri Oct 6 13:41:05 2023 +1000
 1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging tests/src/python/test_qgshighlight.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgshighlight.py

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-54864-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 250c1560cf6a33fff62819cfde5d11e78af9598b,175868493532a0ce6a4d93cf5c661bfee97a8429,de3dafd0db3d17b126967fde4fa891de31081225,41def10ebbc7132b5090e1032c3cec225b0098e7
# Push it to GitHub
git push --set-upstream origin backport-54864-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-54864-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Visual Style preventing feature highlighting when Identify Results is active
3 participants