1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Fix notification edge bound checking

This commit is contained in:
TheSpiritXIII 2015-06-09 10:13:49 -04:00
parent b83b5dbe59
commit df630da726

View File

@ -22,13 +22,11 @@
#include <QScrollBar> #include <QScrollBar>
#include <cassert> #include <cassert>
#include <QDebug>
#include <QTimer>
NotificationScrollArea::NotificationScrollArea(QWidget* parent) NotificationScrollArea::NotificationScrollArea(QWidget* parent)
: AdjustingScrollArea(parent) : AdjustingScrollArea(parent)
{ {
connect(verticalScrollBar(), &QAbstractSlider::valueChanged, this, &NotificationScrollArea::updateTracking); connect(verticalScrollBar(), &QAbstractSlider::valueChanged, this, &NotificationScrollArea::updateTracking);
connect(verticalScrollBar(), &QAbstractSlider::rangeChanged, this, &NotificationScrollArea::updateTracking);
} }
void NotificationScrollArea::trackWidget(GenericChatroomWidget* widget) void NotificationScrollArea::trackWidget(GenericChatroomWidget* widget)
@ -64,7 +62,6 @@ void NotificationScrollArea::trackWidget(GenericChatroomWidget* widget)
trackedWidgets.insert(widget, visibility); trackedWidgets.insert(widget, visibility);
} }
qDebug() << "VISIBLE?" << visibility;
} }
void NotificationScrollArea::updateTracking() void NotificationScrollArea::updateTracking()
@ -183,7 +180,7 @@ NotificationScrollArea::Visibility NotificationScrollArea::widgetVisible(QWidget
if (y < 0) if (y < 0)
return Above; return Above;
else if (y + widget->height() > viewport()->height()) else if (y + widget->height() - 1 > viewport()->height())
return Below; return Below;
return Visible; return Visible;