Skip to content

[pull] master from mapeditor:master - #82

Merged
pull[bot] merged 9 commits into
dogboydog:masterfrom
mapeditor:master
Mar 25, 2026
Merged

pull[bot] merged 9 commits into
dogboydog:masterfrom
mapeditor:master

Conversation

@pull

@pull pull Bot commented Mar 25, 2026 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

bjorn and others added 9 commits March 25, 2026 09:39
On macOS, clicking the type combo box would immediately cause the property to
get added or canceled due to the loss of focus.

This was fixed in two ways:

- Override ComboBox::showPopup() to ensure the combo box has focus
  before opening the popup, so that focus returns to it when the popup
  closes.

- Use a delayed check in the focus-out handler, skipping action when a
  popup is active (QApplication::activePopupWidget) or when focus has
  returned to the property row.

Closes #4445

(cherry picked from commit da4153b)
Suppress updates on the scroll widget during the properties rebuild and
re-enable them with a double deferred QTimer::singleShot(0) call. This
ensures that all scheduled layout requests are fully processed before
the next paint.

(cherry picked from commit 17a47f4)
Conflicts:
	NEWS.md
Since the update to Qt 6.10, the minimum supported macOS version is 13,
so the Qt 5 build now applies to macOS 10.13 till macOS 12.

I forgot to update this for the Tiled 1.11.1 and 1.11.2 releases, which
due to the upgrade to Qt 6.8 at the time had a minimum supported version
of macOS 12.
)

When deselecting the current object, its properties generally remain
visible in the Properties view. But when changing any of the properties,
the changes were only applied to "selected objects".

Now, when there is still a MapObject set as the current object, changing
its properties will apply to it regardless of whether it is still
selected.
Co-authored-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
@pull pull Bot locked and limited conversation to collaborators Mar 25, 2026
@pull pull Bot added the ⤵️ pull label Mar 25, 2026
@pull
pull Bot merged commit ac6461c into dogboydog:master Mar 25, 2026
5 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants