Figure out segfault
This commit is contained in:
parent
696dc2ed2a
commit
8a64b5a981
|
@ -21,24 +21,24 @@ QtMaterialRippleOverlay::~QtMaterialRippleOverlay()
|
|||
|
||||
void QtMaterialRippleOverlay::addRipple(QtMaterialRipple *ripple)
|
||||
{
|
||||
ripple->setOverlay(this);
|
||||
m_ripples.push_back(ripple);
|
||||
ripple->start();
|
||||
//ripple->setOverlay(this);
|
||||
//m_ripples.push_back(ripple);
|
||||
//ripple->start();
|
||||
}
|
||||
|
||||
void QtMaterialRippleOverlay::addRipple(const QPoint &position, qreal radius)
|
||||
{
|
||||
QtMaterialRipple *ripple = new QtMaterialRipple(position);
|
||||
ripple->setRadiusEndValue(radius);
|
||||
addRipple(ripple);
|
||||
//QtMaterialRipple *ripple = new QtMaterialRipple(position);
|
||||
//ripple->setRadiusEndValue(radius);
|
||||
//addRipple(ripple);
|
||||
}
|
||||
|
||||
void QtMaterialRippleOverlay::removeRipple(QtMaterialRipple *ripple)
|
||||
{
|
||||
if (m_ripples.removeOne(ripple)) {
|
||||
delete ripple;
|
||||
update();
|
||||
}
|
||||
//if (m_ripples.removeOne(ripple)) {
|
||||
// delete ripple;
|
||||
// update();
|
||||
//}
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include <QtWidgets/QGraphicsDropShadowEffect>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <QEvent>
|
||||
#include <QDebug>
|
||||
#include "qtmaterialflatbutton.h"
|
||||
|
||||
/*!
|
||||
|
@ -104,13 +105,18 @@ void QtMaterialAutoComplete::updateResults(QString text)
|
|||
item->setHaloVisible(false);
|
||||
item->setFixedHeight(50);
|
||||
d->menuLayout->addWidget(item);
|
||||
//item->installEventFilter(this);
|
||||
}
|
||||
} else if (diff < 0) {
|
||||
for (int c = 0; c < -diff; c++) {
|
||||
QWidget *widget = d->menuLayout->itemAt(0)->widget();
|
||||
if (widget) {
|
||||
d->menuLayout->removeWidget(widget);
|
||||
delete widget;
|
||||
//widget->setParent(0);
|
||||
//qDebug() << widget->parent();
|
||||
//qDebug() << widget->parentWidget();
|
||||
//delete widget;
|
||||
widget->deleteLater();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -163,3 +169,20 @@ bool QtMaterialAutoComplete::QtMaterialAutoComplete::event(QEvent *event)
|
|||
}
|
||||
return QtMaterialTextField::event(event);
|
||||
}
|
||||
|
||||
bool QtMaterialAutoComplete::eventFilter(QObject *watched, QEvent *event)
|
||||
{
|
||||
Q_D(QtMaterialAutoComplete);
|
||||
|
||||
switch (event->type())
|
||||
{
|
||||
case QEvent::MouseButtonPress: {
|
||||
qDebug() << "mouse pressl";
|
||||
d->menu->hide();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return QtMaterialTextField::eventFilter(watched, event);
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@ protected slots:
|
|||
|
||||
protected:
|
||||
bool event(QEvent *event) Q_DECL_OVERRIDE;
|
||||
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QtMaterialAutoComplete)
|
||||
|
|
Loading…
Reference in New Issue