diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | resources/qml/TimelineBubbleMessageStyle.qml | 2 | ||||
| -rw-r--r-- | src/timeline/EventDelegateChooser.cpp | 19 | ||||
| -rw-r--r-- | src/timeline/TimelineModel.cpp | 1 |
4 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dab93df..c345883d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,6 @@ build-tw: "pkgconfig" "spdlog-devel" "zlib-devel" - "libQt5PlatformHeaders-devel" "cmake(re2)" "cmake(Qt6Core)" "cmake(Qt6DBus)" @@ -117,6 +116,7 @@ build-tw: "cmake(Qt6Svg)" "cmake(Qt6Widgets)" "cmake(Qt6Gui)" + "qt6-qml-private-devel" "pkgconfig(libcurl)" "pkgconfig(libevent)" "pkgconfig(gstreamer-webrtc-1.0)" diff --git a/resources/qml/TimelineBubbleMessageStyle.qml b/resources/qml/TimelineBubbleMessageStyle.qml index cf6f1dec..7635fba9 100644 --- a/resources/qml/TimelineBubbleMessageStyle.qml +++ b/resources/qml/TimelineBubbleMessageStyle.qml @@ -279,7 +279,7 @@ TimelineEvent { } } - padding: 4 + padding: wrapper.isStateEvent ? 0 : 4 background: Rectangle { color: !wrapper.isStateEvent ? Qt.tint(palette.base, Qt.hsla(messageBubble.userColor.hslHue, 0.5, messageBubble.userColor.hslLightness, 0.2)) : "transparent" radius: 4 diff --git a/src/timeline/EventDelegateChooser.cpp b/src/timeline/EventDelegateChooser.cpp index e2319460..4367bb9c 100644 --- a/src/timeline/EventDelegateChooser.cpp +++ b/src/timeline/EventDelegateChooser.cpp @@ -10,6 +10,8 @@ #include <QQmlEngine> #include <QtGlobal> +#include <ranges> + // privat qt headers to access required properties #include <QtQml/private/qqmlincubator_p.h> #include <QtQml/private/qqmlobjectcreator_p.h> @@ -133,7 +135,7 @@ EventDelegateChooser::DelegateIncubator::setInitialState(QObject *obj) } } - nhlog::ui()->debug("Querying data for id {}", currentId.toStdString()); + // nhlog::ui()->debug("Querying data for id {}", currentId.toStdString()); chooser.room_->multiData(currentId, forReply ? chooser.eventId_ : QString(), roles); Qt::beginPropertyUpdateGroup(); @@ -169,7 +171,7 @@ EventDelegateChooser::DelegateIncubator::setInitialState(QObject *obj) forReply ? chooser.eventId_ : QString()) .toInt(); if (type != oldType) { - nhlog::ui()->debug("Type changed!"); + // nhlog::ui()->debug("Type changed!"); reset(currentId); return; } @@ -178,7 +180,8 @@ EventDelegateChooser::DelegateIncubator::setInitialState(QObject *obj) std::vector<QModelRoleData> rolesToRequest; if (changedRoles.empty()) { - for (auto role : roleToPropIdx.keys()) + for (const auto role : + std::ranges::subrange(roleToPropIdx.keyBegin(), roleToPropIdx.keyEnd())) rolesToRequest.emplace_back(role); } else { for (auto role : changedRoles) { @@ -229,7 +232,7 @@ EventDelegateChooser::DelegateIncubator::reset(QString id) if (!chooser.room_ || id.isEmpty()) return; - nhlog::ui()->debug("Reset with id {}, reply {}", id.toStdString(), forReply); + // nhlog::ui()->debug("Reset with id {}, reply {}", id.toStdString(), forReply); this->currentId = id; @@ -242,8 +245,8 @@ EventDelegateChooser::DelegateIncubator::reset(QString id) for (const auto choice : qAsConst(chooser.choices_)) { const auto &choiceValue = choice->roleValues(); if (choiceValue.contains(role) || choiceValue.empty()) { - nhlog::ui()->debug( - "Instantiating type: {}, c {}", (int)role, choiceValue.contains(role)); + // nhlog::ui()->debug( + // "Instantiating type: {}, c {}", (int)role, choiceValue.contains(role)); if (auto child = qobject_cast<QQuickItem *>(object())) { child->setParentItem(nullptr); @@ -296,7 +299,7 @@ EventDelegateChooser::updatePolish() auto mainChild = qobject_cast<QQuickItem *>(eventIncubator.object()); auto replyChild = qobject_cast<QQuickItem *>(replyIncubator.object()); - nhlog::ui()->critical("POLISHING {}", (void *)this); + // nhlog::ui()->trace("POLISHING {}", (void *)this); auto layoutItem = [this](QQuickItem *item, int inset) { if (item) { @@ -331,8 +334,6 @@ EventDelegateChooser::updatePolish() item->setHeight(height); } - nhlog::ui()->debug( - "Made event delegate width: {}, {}", width, item->metaObject()->className()); item->setWidth(width); item->ensurePolished(); } diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index c2bcfeb5..aa7a5e6a 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -2290,7 +2290,6 @@ TimelineModel::markSpecialEffectsDone() QString TimelineModel::formatTypingUsers(const QStringList &users, const QColor &bg) { - nhlog::db()->critical("TYPING USERS!"); QString temp = tr("%1 and %2 are typing.", "Multiple users are typing. First argument is a comma separated list of potentially " |