bmckwm/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull requests Activity

Fix build for qt 5, removed some debug messages

Browse source
This commit is contained in:
Blue 2024-12-14 18:08:50 +02:00
parent d4cec645b5
commit 321f0b03c8
Signed by untrusted user: blue
GPG key ID: 9B203B252A63EE38
8 changed files with 57 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ui/widgets/messageline/feedview.cpp
View file

@ -190,7 +190,11 @@ void FeedView::updateGeometries() {
previousOffset += elementMargin;
}
lastDate = currentDate;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QSize messageSize = itemDelegateForIndex(index)->sizeHint(option, index);
#else
QSize messageSize = itemDelegate(index)->sizeHint(option, index);
#endif
uint32_t offsetX(0);
if (specialDelegate) {
if (index.data(Models::MessageFeed::SentByMe).toBool())
@ -240,7 +244,11 @@ bool FeedView::tryToCalculateGeometriesWithNoScrollbars(const QStyleOptionViewIt
previousOffset += elementMargin;
}
lastDate = currentDate;
QSize messageSize = itemDelegateForIndex(index)->sizeHint(option, index);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QSize messageSize = itemDelegateForIndex(index)->sizeHint(option, index);
#else
QSize messageSize = itemDelegate(index)->sizeHint(option, index);
#endif
if (previousOffset + messageSize.height() + elementMargin > totalHeight)
return false;
@ -333,7 +341,12 @@ void FeedView::paintEvent(QPaintEvent* event) {
stripe.setWidth(viewportRect.width());
bool mouseOver = stripe.contains(cursor) && viewportRect.contains(cursor);
option.state.setFlag(QStyle::State_MouseOver, mouseOver);
itemDelegateForIndex(index)->paint(&painter, option, index);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
itemDelegateForIndex(index)->paint(&painter, option, index);
#else
itemDelegate(index)->paint(&painter, option, index);
#endif
if (!lastDate.isNull() && currentDate.daysTo(lastDate) > 0)
drawDateDevider(option.rect.bottom(), lastDate, painter);
@ -393,8 +406,12 @@ void FeedView::setAnchorHovered(Shared::Hover type) {
void FeedView::mouseMoveEvent(QMouseEvent* event) {
if (!isVisible())
return;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
dragEndPoint = event->position().toPoint();
#else
dragEndPoint = event->localPos().toPoint();
#endif
dragEndPoint = event->position().toPoint();
if (mousePressed) {
QPoint distance = dragStartPoint - dragEndPoint;
if (distance.manhattanLength() > 5)
@ -437,7 +454,11 @@ void FeedView::mousePressEvent(QMouseEvent* event) {
mousePressed = event->button() == Qt::LeftButton;
if (mousePressed) {
dragStartPoint = event->position().toPoint();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
dragStartPoint = event->position().toPoint();
#else
dragStartPoint = event->localPos().toPoint();
#endif
if (specialDelegate && specialModel) {
MessageDelegate* del = static_cast<MessageDelegate*>(itemDelegate());
QString lastSelectedId = del->clearSelection();
@ -455,7 +476,11 @@ void FeedView::mouseDoubleClickEvent(QMouseEvent* event) {
QAbstractItemView::mouseDoubleClickEvent(event);
mousePressed = event->button() == Qt::LeftButton;
if (mousePressed) {
dragStartPoint = event->position().toPoint();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
dragStartPoint = event->position().toPoint();
#else
dragStartPoint = event->localPos().toPoint();
#endif
if (specialDelegate && specialModel) {
MessageDelegate* del = static_cast<MessageDelegate*>(itemDelegate());
QString lastSelectedId = del->clearSelection();
@ -483,7 +508,11 @@ void FeedView::mouseReleaseEvent(QMouseEvent* event) {
if (mousePressed) {
if (!dragging && specialDelegate) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QPoint point = event->position().toPoint();
#else
QPoint point = event->localPos().toPoint();
#endif
QModelIndex index = indexAt(point);
if (index.isValid()) {
QRect rect = visualRect(index);