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

Fix layout dpi should not update while typing #59398

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

YoannQDQ
Copy link
Contributor

@github-actions github-actions bot added this to the 3.42.0 milestone Nov 10, 2024
@agiudiceandrea
Copy link
Contributor

I think it would be useful to backport this fix to 3.40 and 3.34, or at least to 3.40.

Copy link

github-actions bot commented Nov 11, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit f84765c)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit f84765c)

@nicogodet
Copy link
Member

A timer could be nice instead of editingFinished

@YoannQDQ YoannQDQ added the Print Layouts Related to QGIS Print Layouts, Atlas or Reporting frameworks label Nov 25, 2024
@nyalldawson
Copy link
Collaborator

A timer could be nice instead of editingFinished

See #59787 -- @YoannQDQ it should be trivial to change to that signal when #59787 is merged

@nyalldawson
Copy link
Collaborator

Merging for now in order to get backports functional -- the timeout change can be addressed later

@nyalldawson nyalldawson merged commit d710ea7 into qgis:master Dec 9, 2024
30 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Dec 9, 2024

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f84765ce61f... layout update dpi on editingFinished
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/gui/layout/qgslayoutpropertieswidget.cpp
CONFLICT (content): Merge conflict in src/gui/layout/qgslayoutpropertieswidget.cpp

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-59398-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f84765ce61f87528818feed181e83070397be37d
# Push it to GitHub
git push --set-upstream origin backport-59398-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-59398-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Dec 9, 2024
@qgis-bot
Copy link
Collaborator

qgis-bot commented Dec 9, 2024

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f84765ce61f... layout update dpi on editingFinished
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/gui/layout/qgslayoutpropertieswidget.cpp
CONFLICT (content): Merge conflict in src/gui/layout/qgslayoutpropertieswidget.cpp

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

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

@YoannQDQ YoannQDQ deleted the fix-#56727 branch December 9, 2024 10:04
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 backport release-3_40 failed backport The automated backport attempt failed, needs a manual backport Print Layouts Related to QGIS Print Layouts, Atlas or Reporting frameworks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Do not update DPI of layout until field is left or the Enter key is pushed
5 participants