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

Merge branch 'feature/remove_guides' of https://github.com/yehjaemin/opentoonz into yehjaemin-feature/remove_guides

Browse source
This commit is contained in:
shun-iwasawa 2019-09-04 11:13:34 +09:00
commit 6338155dbf
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
toonz/sources/toonz/ruler.cpp
View file

@ -248,7 +248,7 @@ double Ruler::posToValue(const QPoint &p) const {
//-----------------------------------------------------------------------------
void Ruler::mousePressEvent(QMouseEvent *e) {
if (e->button() == Qt::LeftButton) {
if (e->button() == Qt::LeftButton || e->button() == Qt::RightButton) {
Guides &guides = getGuides();
double v = posToValue(e->pos());
m_hiding = false;
@ -265,7 +265,7 @@ void Ruler::mousePressEvent(QMouseEvent *e) {
selected = i;
}
}
if (selected < 0 || minDist2 > 25) {
if (e->button() == Qt::LeftButton && (selected < 0 || minDist2 > 25)) {
// crea una nuova guida
guides.push_back(v * getDevPixRatio());
m_viewer->update();
@ -274,6 +274,12 @@ void Ruler::mousePressEvent(QMouseEvent *e) {
// muove la guida vecchia
if (selected < count - 1) std::swap(guides[selected], guides.back());
// aggiorna sprop!!!!
if (e->button() == Qt::RightButton) {
assert(!getGuides().empty());
getGuides().pop_back();
update();
m_viewer->update();
}
}
m_moving = true;
update();