SVN commit 650694 by cgilles: digikam from trunk : bug fix with pan icon view of Canvas : always refresh pan view when user change current image in editor M +14 -10 canvas.cpp --- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp #650693:650694 @@ -1206,20 +1206,24 @@ void Canvas::slotCornerButtonReleased() { - if (!d->panIconPopup) + if (d->panIconPopup) { - d->panIconPopup = new KPopupFrame(this); - ImagePanIconWidget *pan = new ImagePanIconWidget(180, 120, d->panIconPopup); - d->panIconPopup->setMainWidget(pan); + d->panIconPopup->hide(); + delete d->panIconPopup; + d->panIconPopup = 0; + } - QRect r((int)(contentsX() / d->zoom), (int)(contentsY() / d->zoom), - (int)(visibleWidth() / d->zoom), (int)(visibleHeight() / d->zoom)); - pan->setRegionSelection(r); + d->panIconPopup = new KPopupFrame(this); + ImagePanIconWidget *pan = new ImagePanIconWidget(180, 120, d->panIconPopup); + d->panIconPopup->setMainWidget(pan); - connect(pan, SIGNAL(signalSelectionMoved(QRect, bool)), - this, SLOT(slotPanIconSelectionMoved(QRect, bool))); - } + QRect r((int)(contentsX() / d->zoom), (int)(contentsY() / d->zoom), + (int)(visibleWidth() / d->zoom), (int)(visibleHeight() / d->zoom)); + pan->setRegionSelection(r); + connect(pan, SIGNAL(signalSelectionMoved(QRect, bool)), + this, SLOT(slotPanIconSelectionMoved(QRect, bool))); + QPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); g.setY(g.y()+ viewport()->size().height());