mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 14:25:27 +00:00
f54268e527
The recent simplification of the close button code introduced a crash:
Deletion of pictures caused an invalid memory access, because the
CloseButtonItem was deleted with the parent DivePicture item.
For some (not fully understood!) reason, a reference to this button
was stored in the depths of Qt.
Empirically, it was found out that removing the first line of the pair
QGraphicsItem::mousePressEvent(event);
emit clicked();
fixed the crash.
It seemed therefore prudent to remove the whole questionable signal/slot
mechanism and directly call the removePicture() function of the parent.
Thus, the intermediate DiveButtonItem class became unnecessary and was
removed, leading to a shallower class hierarchy.
Unfortunately, CloseButtonItem must still be derived from QObject owing
to the Q_PROPERTY machinery, which is in turn needed for animation.
To make this compile on mobile, the conditional compilation of
removePicture() (#ifndef SUBSURFACE_MOBILE) was removed. After all,
if DivePixmapItem is used, there are pictures, so removePicture()
should be functional. Conditional compilation should concern the
whole class, not only this function.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
|
||
|---|---|---|
| .. | ||
| animationfunctions.cpp | ||
| animationfunctions.h | ||
| CMakeLists.txt | ||
| divecartesianaxis.cpp | ||
| divecartesianaxis.h | ||
| diveeventitem.cpp | ||
| diveeventitem.h | ||
| divelineitem.cpp | ||
| divelineitem.h | ||
| divepixmapitem.cpp | ||
| divepixmapitem.h | ||
| diveprofileitem.cpp | ||
| diveprofileitem.h | ||
| diverectitem.cpp | ||
| diverectitem.h | ||
| divetextitem.cpp | ||
| divetextitem.h | ||
| divetooltipitem.cpp | ||
| divetooltipitem.h | ||
| profilewidget2.cpp | ||
| profilewidget2.h | ||
| ruleritem.cpp | ||
| ruleritem.h | ||
| tankitem.cpp | ||
| tankitem.h | ||