diff --git a/libs/ui/kis_popup_palette.h b/libs/ui/kis_popup_palette.h --- a/libs/ui/kis_popup_palette.h +++ b/libs/ui/kis_popup_palette.h @@ -57,6 +57,7 @@ //functions to set up selectedColor void setSelectedColor(int x); int selectedColor() const; + void setParent(QWidget *parent); virtual void tabletEvent(QTabletEvent * event); diff --git a/libs/ui/kis_popup_palette.cpp b/libs/ui/kis_popup_palette.cpp --- a/libs/ui/kis_popup_palette.cpp +++ b/libs/ui/kis_popup_palette.cpp @@ -251,21 +251,18 @@ void KisPopupPalette::adjustLayout(const QPoint &p) { KIS_ASSERT_RECOVER_RETURN(m_brushHud); - if (isVisible() && parentWidget()) { const QRect fitRect = kisGrowRect(parentWidget()->rect(), -widgetMargin); const QPoint paletteCenterOffset(width() / 2, height() / 2); QRect paletteRect = rect(); paletteRect.moveTo(p - paletteCenterOffset); - if (m_brushHudButton->isChecked()) { m_brushHud->updateGeometry(); paletteRect.adjust(0, 0, m_brushHud->width() + hudMargin, 0); } paletteRect = kisEnsureInRect(paletteRect, fitRect); - move(paletteRect.topLeft()); m_brushHud->move(paletteRect.topLeft() + QPoint(widgetSize + hudMargin, 0)); m_lastCenterPoint = p; @@ -312,6 +309,11 @@ QWidget::setVisible(b); } +void KisPopupPalette::setParent(QWidget *parent) { + m_brushHud->setParent(parent); + QWidget::setParent(parent); +} + QSize KisPopupPalette::sizeHint() const { return QSize(widgetSize, widgetSize);