Final changes, branch now buildable
This commit is contained in:
@@ -124,14 +124,14 @@ FilmNegative::FilmNegative() :
|
||||
filmBaseSpotButton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::baseSpotToggled));
|
||||
|
||||
// Editing geometry; create the spot rectangle
|
||||
Rectangle* const spotRect = new Rectangle();
|
||||
EditRectangle* const spotRect = new EditRectangle();
|
||||
spotRect->filled = false;
|
||||
|
||||
visibleGeometry.push_back(spotRect);
|
||||
|
||||
// Stick a dummy rectangle over the whole image in mouseOverGeometry.
|
||||
// This is to make sure the getCursor() call is fired everywhere.
|
||||
Rectangle* const imgRect = new Rectangle();
|
||||
EditRectangle* const imgRect = new EditRectangle();
|
||||
imgRect->filled = true;
|
||||
|
||||
mouseOverGeometry.push_back(imgRect);
|
||||
@@ -284,7 +284,7 @@ CursorShape FilmNegative::getCursor(int objectID) const
|
||||
bool FilmNegative::mouseOver(int modifierKey)
|
||||
{
|
||||
EditDataProvider* const provider = getEditProvider();
|
||||
Rectangle* const spotRect = static_cast<Rectangle*>(visibleGeometry.at(0));
|
||||
EditRectangle* const spotRect = static_cast<EditRectangle*>(visibleGeometry.at(0));
|
||||
spotRect->setXYWH(provider->posImage.x - 16, provider->posImage.y - 16, 32, 32);
|
||||
|
||||
return true;
|
||||
@@ -386,7 +386,7 @@ void FilmNegative::editToggled()
|
||||
|
||||
// Stick a dummy rectangle over the whole image in mouseOverGeometry.
|
||||
// This is to make sure the getCursor() call is fired everywhere.
|
||||
Rectangle* const imgRect = static_cast<Rectangle*>(mouseOverGeometry.at(0));
|
||||
EditRectangle* const imgRect = static_cast<EditRectangle*>(mouseOverGeometry.at(0));
|
||||
imgRect->setXYWH(0, 0, w, h);
|
||||
} else {
|
||||
refSpotCoords.clear();
|
||||
@@ -408,7 +408,7 @@ void FilmNegative::baseSpotToggled()
|
||||
|
||||
// Stick a dummy rectangle over the whole image in mouseOverGeometry.
|
||||
// This is to make sure the getCursor() call is fired everywhere.
|
||||
Rectangle* const imgRect = static_cast<Rectangle*>(mouseOverGeometry.at(0));
|
||||
EditRectangle* const imgRect = static_cast<EditRectangle*>(mouseOverGeometry.at(0));
|
||||
imgRect->setXYWH(0, 0, w, h);
|
||||
} else {
|
||||
refSpotCoords.clear();
|
||||
|
Reference in New Issue
Block a user