razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #1098 from manongjohn/fix_moving_styles_in_palette

Browse source 
Fix moving styles in palette
This commit is contained in:
manongjohn 2022-12-07 06:46:42 -05:00 committed by GitHub
commit a999bd0801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toonz/sources/common/tvrender/tpalette.cpp
View file

@ -202,15 +202,16 @@ void TPalette::Page::insertStyle(int indexInPage, TPixel32 color) {
//------------------------------------------------------------------- //-------------------------------------------------------------------
void TPalette::Page::removeStyle(int indexInPage) { void TPalette::Page::removeStyle(int indexInPage, bool flagOnly) {
if (indexInPage < 0 || indexInPage >= getStyleCount()) return; if (indexInPage < 0 || indexInPage >= getStyleCount()) return;
assert(m_palette); assert(m_palette);
int styleId = getStyleId(indexInPage); int styleId = getStyleId(indexInPage);
assert(0 <= styleId && styleId < m_palette->getStyleCount()); assert(0 <= styleId && styleId < m_palette->getStyleCount());
assert(m_palette->m_styles[styleId].first == this); assert(m_palette->m_styles[styleId].first == this);
m_palette->m_styles[styleId].first = 0; m_palette->m_styles[styleId].first = 0;
m_palette->m_styles[styleId].second = if (!flagOnly)
TColorStyleP(new TSolidColorStyle(TPixel32::Black)); m_palette->m_styles[styleId].second =
TColorStyleP(new TSolidColorStyle(TPixel32::Black));
m_styleIds.erase(m_styleIds.begin() + indexInPage); m_styleIds.erase(m_styleIds.begin() + indexInPage);
} }

6
toonz/sources/include/tpalette.h
View file

@ -163,8 +163,10 @@ public:
//! its //! its
//! id at the specified position in the page. //! id at the specified position in the page.
void removeStyle(int indexInPage); //!< Removes the style at the specified void removeStyle(
//! position from this page. int indexInPage,
bool flagOnly = false); //!< Removes the style at the specified
//! position from this page.
int search(int styleId) int search(int styleId)
const; //!< Returns the page position of the specified style id, const; //!< Returns the page position of the specified style id,
//! or \p -1 if it cannot be found on the page. //! or \p -1 if it cannot be found on the page.

6
toonz/sources/toonzlib/palettecmd.cpp
View file

@ -212,7 +212,7 @@ public:
int k; int k;
for (k = 0; k < count; k++) { for (k = 0; k < count; k++) {
styles.push_back(dstPage->getStyleId(h)); styles.push_back(dstPage->getStyleId(h));
dstPage->removeStyle(h); dstPage->removeStyle(h, true);
} }
k = 0; k = 0;
for (i = m_srcIndicesInPage.begin(); i != m_srcIndicesInPage.end(); for (i = m_srcIndicesInPage.begin(); i != m_srcIndicesInPage.end();
@ -235,7 +235,7 @@ public:
int index = *i; int index = *i;
if (m_dstPageIndex == m_srcPageIndex && index < k) k--; if (m_dstPageIndex == m_srcPageIndex && index < k) k--;
styles.push_back(srcPage->getStyleId(index)); styles.push_back(srcPage->getStyleId(index));
srcPage->removeStyle(index); srcPage->removeStyle(index, true);
} }
for (j = styles.begin(); j != styles.end(); ++j) for (j = styles.begin(); j != styles.end(); ++j)
dstPage->insertStyle(k, *j); dstPage->insertStyle(k, *j);
@ -300,7 +300,7 @@ public:
assert(page); assert(page);
int indexInPage = page->search(m_styleId); int indexInPage = page->search(m_styleId);
assert(indexInPage >= 0); assert(indexInPage >= 0);
page->removeStyle(indexInPage); page->removeStyle(indexInPage, true);
m_paletteHandle->notifyPaletteChanged(); m_paletteHandle->notifyPaletteChanged();
} }
void redo() const override { void redo() const override {

2
toonz/sources/toonzqt/styleselection.cpp
View file

@ -153,6 +153,7 @@ bool pasteStylesWithoutUndo(TPalette *palette, TPaletteHandle *pltHandle,
// cerco il punto di inserimento (dopo lo stile corrente) // cerco il punto di inserimento (dopo lo stile corrente)
int currentStyleIndex = pltHandle->getStyleIndex(); int currentStyleIndex = pltHandle->getStyleIndex();
int indexInPage = page->search(currentStyleIndex) + 1; int indexInPage = page->search(currentStyleIndex) + 1;
if (pageIndex == 0 && indexInPage < 2) indexInPage = 2;
const StyleData *data = const StyleData *data =
dynamic_cast<const StyleData *>(QApplication::clipboard()->mimeData()); dynamic_cast<const StyleData *>(QApplication::clipboard()->mimeData());
if (!data) return false; if (!data) return false;
@ -298,6 +299,7 @@ public:
TPalette::Page *page = m_palette->getPage(m_pageIndex); TPalette::Page *page = m_palette->getPage(m_pageIndex);
assert(page); assert(page);
int indexInPage = page->search(m_oldStyleIndex) + 1; int indexInPage = page->search(m_oldStyleIndex) + 1;
if (m_pageIndex == 0 && indexInPage < 2) indexInPage = 2;
const StyleData *data = dynamic_cast<const StyleData *>(m_data); const StyleData *data = dynamic_cast<const StyleData *>(m_data);
assert(data); assert(data);
std::set<int> styleIndicesInPage; std::set<int> styleIndicesInPage;