From bb34b97f74de08033ef044645df8931f4d1f02fb Mon Sep 17 00:00:00 2001 From: laserpants Date: Tue, 22 Mar 2016 12:50:33 +0300 Subject: [PATCH] make getStyleOption protected --- components/iconbutton.cpp | 18 +++++++++--------- components/iconbutton.h | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/components/iconbutton.cpp b/components/iconbutton.cpp index 2830388..1c29b32 100644 --- a/components/iconbutton.cpp +++ b/components/iconbutton.cpp @@ -87,15 +87,6 @@ bool IconButton::eventFilter(QObject *obj, QEvent *event) return QAbstractButton::eventFilter(obj, event); } -void IconButton::updateOverlayGeometry() -{ - if (!_overlay || !_geometryWidget) - return; - - const int s = iconSize().width()/2; - _overlay->setGeometry(_geometryWidget->geometry().adjusted(-s, -s, s, s)); -} - QStyleOptionButton IconButton::getStyleOption() const { QStyleOptionButton option; @@ -107,3 +98,12 @@ QStyleOptionButton IconButton::getStyleOption() const option.iconSize = iconSize(); return option; } + +void IconButton::updateOverlayGeometry() +{ + if (!_overlay || !_geometryWidget) + return; + + const int s = iconSize().width()/2; + _overlay->setGeometry(_geometryWidget->geometry().adjusted(-s, -s, s, s)); +} diff --git a/components/iconbutton.h b/components/iconbutton.h index 33cfbcc..f037000 100644 --- a/components/iconbutton.h +++ b/components/iconbutton.h @@ -23,9 +23,10 @@ protected: bool event(QEvent *event) Q_DECL_OVERRIDE; bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; + QStyleOptionButton getStyleOption() const; + private: void updateOverlayGeometry(); - QStyleOptionButton getStyleOption() const; RippleOverlay *const _overlay; QWidget *_geometryWidget;