drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/core/studio] Fix TileSheetEditor cut to use undo stack

Browse Source
This commit is contained in:
Gary Talent 2020-10-21 00:47:46 -05:00
parent 2580dbb7ab
commit b960539e5f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nostalgia/core/studio/tilesheeteditor.cpp
View File

@ -618,15 +618,16 @@ void SheetData::cutToClipboard() {
void SheetData::cutToClipboard(TileSheetClipboard *cb) { void SheetData::cutToClipboard(TileSheetClipboard *cb) {
const auto start = ptToIdx(cb->point1(), m_columns); const auto start = ptToIdx(cb->point1(), m_columns);
const auto end = ptToIdx(cb->point2(), m_columns); const auto end = ptToIdx(cb->point2(), m_columns);
TileSheetClipboard apply;
for (int i = start; i <= end; ++i) { for (int i = start; i <= end; ++i) {
const auto s = m_pixelSelected[i]; const auto s = m_pixelSelected[i];
if (s) { if (s) {
cb->add(i, m_pixels[i]); cb->add(i, m_pixels[i]);
m_pixels[i] = 0; apply.add(i, 0);
} }
} }
emit pixelsChanged(); apply.setPoints(cb->point1(), cb->point2());
emit changeOccurred(); m_cmdStack->push(new PasteClipboardCommand(this, *cb, apply));
} }
void SheetData::copyToClipboard() { void SheetData::copyToClipboard() {

4
src/nostalgia/core/studio/tilesheeteditor.hpp
View File

@ -72,8 +72,8 @@ struct TileSheetClipboard {
friend ox::Error model(T*, TileSheetClipboard*); friend ox::Error model(T*, TileSheetClipboard*);
protected: protected:
ox::Vector<PixelChunk> m_chunks; std::vector<PixelChunk> m_chunks;
ox::Vector<int> m_pixels; std::vector<int> m_pixels;
common::Point m_p1; common::Point m_p1;
common::Point m_p2; common::Point m_p2;