summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/FloatingButton.cpp1
-rw-r--r--src/ui/MxcAnimatedImage.h2
-rw-r--r--src/ui/OverlayWidget.cpp2
-rw-r--r--src/ui/SnackBar.cpp2
-rw-r--r--src/ui/UserProfile.h2
5 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/FloatingButton.cpp b/src/ui/FloatingButton.cpp

index 3f88e313..5dc777d2 100644 --- a/src/ui/FloatingButton.cpp +++ b/src/ui/FloatingButton.cpp
@@ -2,6 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later +#include <QEvent> #include <QPainter> #include <QPainterPath> diff --git a/src/ui/MxcAnimatedImage.h b/src/ui/MxcAnimatedImage.h
index c3ca24d1..0b678ab6 100644 --- a/src/ui/MxcAnimatedImage.h +++ b/src/ui/MxcAnimatedImage.h
@@ -9,7 +9,7 @@ #include <QObject> #include <QQuickItem> -class TimelineModel; +#include "timeline/TimelineModel.h" // This is an AnimatedImage, that can draw encrypted images class MxcAnimatedImage : public QQuickItem diff --git a/src/ui/OverlayWidget.cpp b/src/ui/OverlayWidget.cpp
index 4e338753..f47c035c 100644 --- a/src/ui/OverlayWidget.cpp +++ b/src/ui/OverlayWidget.cpp
@@ -72,7 +72,7 @@ OverlayWidget::paintEvent(QPaintEvent *event) Q_UNUSED(event); QStyleOption opt; - opt.init(this); + opt.initFrom(this); QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp
index 90187154..077cb9de 100644 --- a/src/ui/SnackBar.cpp +++ b/src/ui/SnackBar.cpp
@@ -17,7 +17,7 @@ SnackBar::SnackBar(QWidget *parent) { QFont font; font.setPointSizeF(font.pointSizeF() * 1.2); - font.setWeight(50); + font.setWeight(QFont::Weight::Thin); setFont(font); boxHeight_ = QFontMetrics(font).height() * 2; diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h
index cd2f4740..c1d7a79c 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h
@@ -12,6 +12,7 @@ #include <mtx/responses/common.hpp> #include "CacheCryptoStructs.h" +#include "timeline/TimelineModel.h" namespace verification { Q_NAMESPACE @@ -28,7 +29,6 @@ Q_ENUM_NS(Status) } class DeviceVerificationFlow; -class TimelineModel; class TimelineViewManager; class DeviceInfo