Skip to content

Fix advanced digitizing floater not wide enough - #66663

Merged
nyalldawson merged 1 commit into
qgis:masterfrom
elpaso:bugfix-gh-65171-advanced-digitizing-floater-align-left
Jul 5, 2026
Merged

Fix advanced digitizing floater not wide enough#66663
nyalldawson merged 1 commit into
qgis:masterfrom
elpaso:bugfix-gh-65171-advanced-digitizing-floater-align-left

Conversation

@elpaso

@elpaso elpaso commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Fix #65171 by making sure most significant digits are always visible (cut decimals and UOM if necessary).

I preferred this to an arbitrary and most of the times
unnecessary enlargement of the floater.

@elpaso elpaso added GUI/UX Related to QGIS application GUI or User Experience Bug Either a bug report, or a bug fix. Let's hope for the latter! Digitizing Related to feature digitizing map tools or functionality labels Jul 2, 2026
@github-actions github-actions Bot added this to the 4.2.0 milestone Jul 2, 2026
@elpaso elpaso added the backport queued_ltr_backports Queued Backports label Jul 2, 2026
@github-actions

github-actions Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
To execute locally, unzip the downloaded zip file and run bin\qgis-bin.exe in the extracted directory.
You might be prompted by Windows Defender click "Run anyway"
(Built from commit 85002cb)

🍎 MacOS Qt6 builds

Download MacOS Qt6 builds of this PR for testing.
This app is not notarized, run sudo xattr -d com.apple.quarantine /Applications/QGIS*.app to avoid the warning
(Built from commit 85002cb)

Fix qgis#65171 by making sure most significant digits are
always visible (cut decimals and UOM if necessary).

I preferred this to an arbitrary and most of time
unnecessary enlargement of the floater.
@elpaso
elpaso force-pushed the bugfix-gh-65171-advanced-digitizing-floater-align-left branch from 84379ef to 85002cb Compare July 2, 2026 13:53
@elpaso elpaso changed the title Fid advanced digitizing floater not wide enough Jul 2, 2026
@nyalldawson
nyalldawson merged commit 3293ef3 into qgis:master Jul 5, 2026
28 checks passed
@qgis-bot

qgis-bot commented Jul 5, 2026

Copy link
Copy Markdown
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 85002cb0ab4... Fix advanced digitizing floater not wide enough
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 set advice.mergeConflict false"

stdout
Auto-merging src/gui/qgsadvanceddigitizingfloater.cpp
CONFLICT (content): Merge conflict in src/gui/qgsadvanceddigitizingfloater.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-66663-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 85002cb0ab40d60e594cdd4a0aab515814d6a231
# Push it to GitHub
git push --set-upstream origin backport-66663-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-66663-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jul 5, 2026
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-4_2 Bug Either a bug report, or a bug fix. Let's hope for the latter! Digitizing Related to feature digitizing map tools or functionality failed backport The automated backport attempt failed, needs a manual backport GUI/UX Related to QGIS application GUI or User Experience

3 participants