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

Don't open layer properties when toggling visibility #56190

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

uclaros
Copy link
Contributor

@uclaros uclaros commented Feb 5, 2024

Description

Fixes #38179
This has been quite annoying so I consider it a bug.

@github-actions github-actions bot added this to the 3.36.0 milestone Feb 5, 2024
Copy link

github-actions bot commented Feb 5, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 75c06b9)

@@ -447,6 +448,7 @@ class GUI_EXPORT QgsLayerTreeView : public QTreeView

bool mShowPrivateLayers = false;

QTimer *mDoubleClickTimer = nullptr;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
QTimer *mDoubleClickTimer = nullptr;
QTimer *mBlockDoubleClickTimer = nullptr;

Or am I reading this wrong?

@nyalldawson nyalldawson merged commit 4dc4bff into qgis:master Feb 6, 2024
28 checks passed
@uclaros
Copy link
Contributor Author

uclaros commented Feb 6, 2024

How about backporting this? Or queue for backporting?

@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 7, 2024

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-56190-to-release-3_34
You are currently cherry-picking commit dd7b650e56a.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56190-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick dd7b650e56a9933bc3a7da94c2cc430b36a1e460,5a165fbc949d56d497c55e673fa07b3cf48b34a6,75c06b90dea5203a3b6280a39ccddc20a92a275e
# Push it to GitHub
git push --set-upstream origin backport-56190-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-56190-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 7, 2024
uclaros added a commit to uclaros/QGIS that referenced this pull request Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prevent opening of Layer Properties when double-clicking on visibility checkbox in Layers Panel
3 participants