Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ jobs:
include:
- qt_version: 5.15.2
qt_modules: ""
version_suffix: "10.13-10.15"
version_suffix: "10.13-12"
architectures: x86_64
cmake_architectures: x86_64
- qt_version: 6.10.2
qt_modules: "qtimageformats"
version_suffix: "11+"
version_suffix: "13+"
architectures: x86_64,arm64
cmake_architectures: x86_64;arm64

Expand Down
9 changes: 9 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
### Unreleased

* Added 'Collapse All' action and 'Only Expand to Current' mode to Project view (with rhythmcache, #4346)
* Reduced animated tile marker opacity during terrain editing (by Huy Vũ, #4449)
* Fixed ability to change properties after deselecting the current object (#4440)

### Tiled 1.12.1 (25 March 2026)

* Fixed Properties view flicker when switching between objects or files (#4460)
* Fixed selection mode indicator to not toggle on Alt when it would move objects (by kunal649, #4434)
* Fixed status bar pixel coords being rounded instead of floored (by kunal649, #4426)
* macOS: Fix ability to choose type when adding properties (#4459)

### Tiled 1.12.0 (13 March 2026)

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
# The short X.Y version.
version = '1.12'
# The full version, including alpha/beta/rc tags.
release = '1.12.0'
release = '1.12.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
11 changes: 11 additions & 0 deletions org.mapeditor.Tiled.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@
</keywords>
<content_rating type="oars-1.0" />
<releases>
<release version="1.12.1" type="stable" date="2026-03-25">
<url>https://www.mapeditor.org/2026/03/25/tiled-1-12-1-released.html</url>
<description>
<ul>
<li>Fixed Properties view flicker when switching between objects or files (#4460)</li>
<li>Fixed selection mode indicator to not toggle on Alt when it would move objects (by kunal649, #4434)</li>
<li>Fixed status bar pixel coords being rounded instead of floored (by kunal649, #4426)</li>
<li>macOS: Fix ability to choose type when adding properties (#4459)</li>
</ul>
</description>
</release>
<release version="1.12.0" type="stable" date="2026-03-12">
<url>https://www.mapeditor.org/2026/03/12/tiled-1-12-released.html</url>
<description>
Expand Down
2 changes: 1 addition & 1 deletion src/tiled/propertieswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1946,7 +1946,7 @@ class MapObjectProperties : public ObjectProperties
QUndoCommand *command = new ChangeMapObject(mapDocument(), mapObject(),
property, value);

if (mapDocument()->selectedObjects().size() == 1) {
if (mapDocument()->selectedObjects().size() <= 1) {
push(command);
return;
}
Expand Down
18 changes: 9 additions & 9 deletions src/tiled/tilesetview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@

using namespace Tiled;

namespace {

static void setupTilesetGridTransform(const Tileset &tileset, QTransform &transform, QRect &targetRect)
{
if (tileset.orientation() == Tileset::Isometric) {
Expand All @@ -77,6 +75,8 @@ static void setupTilesetGridTransform(const Tileset &tileset, QTransform &transf
}
}

namespace {

/**
* The delegate for drawing tile items in the tileset view.
*/
Expand All @@ -95,7 +95,7 @@ class TileDelegate : public QAbstractItemDelegate
const QModelIndex &index) const override;

private:
static void drawFilmStrip(QPainter *painter, QRect targetRect);
static void drawFilmStrip(QPainter *painter, QRect targetRect, bool wangEditingActive);

void drawWangOverlay(QPainter *painter,
const Tile *tile,
Expand All @@ -105,6 +105,8 @@ class TileDelegate : public QAbstractItemDelegate
TilesetView *mTilesetView;
};

} // anonymous namespace

void TileDelegate::paint(QPainter *painter,
const QStyleOptionViewItem &option,
const QModelIndex &index) const
Expand Down Expand Up @@ -161,7 +163,7 @@ void TileDelegate::paint(QPainter *painter,

// Overlay with film strip when animated
if (mTilesetView->markAnimatedTiles() && tile->isAnimated())
drawFilmStrip(painter, targetRect);
drawFilmStrip(painter, targetRect, mTilesetView->isEditWangSet());

const auto highlight = option.palette.highlight();

Expand Down Expand Up @@ -211,7 +213,7 @@ QSize TileDelegate::sizeHint(const QStyleOptionViewItem & /* option */,
return QSize(extra, extra);
}

void TileDelegate::drawFilmStrip(QPainter *painter, QRect targetRect)
void TileDelegate::drawFilmStrip(QPainter *painter, QRect targetRect, bool wangEditingActive)
{
painter->save();

Expand All @@ -224,7 +226,7 @@ void TileDelegate::drawFilmStrip(QPainter *painter, QRect targetRect)
painter->scale(scale, scale);
painter->translate(-18, 3);
painter->rotate(-45);
painter->setOpacity(0.8);
painter->setOpacity(wangEditingActive ? 0.3 : 0.8);

QRectF strip(0, 0, 32, 6);
painter->fillRect(strip, Qt::black);
Expand Down Expand Up @@ -278,8 +280,6 @@ void TileDelegate::drawWangOverlay(QPainter *painter,
painter->restore();
}

} // anonymous namespace

TilesetView::TilesetView(QWidget *parent)
: QTableView(parent)
, mZoomable(new Zoomable(this))
Expand Down Expand Up @@ -504,7 +504,7 @@ void TilesetView::keyPressEvent(QKeyEvent *event)
return;
}

return QTableView::keyPressEvent(event);
QTableView::keyPressEvent(event);
}

void TilesetView::setRelocateTiles(bool enabled)
Expand Down
2 changes: 1 addition & 1 deletion tiled.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Project {
qbsSearchPaths: "qbs"
minimumQbsVersion: "1.18"

property string version: Environment.getEnv("TILED_VERSION") || "1.12.0";
property string version: Environment.getEnv("TILED_VERSION") || "1.12.1";
property bool snapshot: Environment.getEnv("TILED_SNAPSHOT") == "true"
property bool release: Environment.getEnv("TILED_RELEASE") == "true"
property string libDir: "lib"
Expand Down
Loading