summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2022-05-10 03:19:53 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2022-05-10 03:20:09 +0200
commita6b2be112b9a9450998985cbc5ec4ce10a5ae432 (patch)
treeac8f472f4a662679f3304c380e95f75d12b2415e /src/ui
parentAdd mtxclient to logging (diff)
downloadnheko-a6b2be112b9a9450998985cbc5ec4ce10a5ae432.tar.xz
More image dialog fixes
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/HiddenEvents.h3
-rw-r--r--src/ui/MxcAnimatedImage.cpp3
-rw-r--r--src/ui/NhekoCursorShape.cpp3
-rw-r--r--src/ui/UIA.h3
-rw-r--r--src/ui/UserProfile.h9
5 files changed, 14 insertions, 7 deletions
diff --git a/src/ui/HiddenEvents.h b/src/ui/HiddenEvents.h

index 928b14ba..52f62bbd 100644 --- a/src/ui/HiddenEvents.h +++ b/src/ui/HiddenEvents.h
@@ -18,7 +18,8 @@ class HiddenEvents : public QObject public: explicit HiddenEvents(QObject *p = nullptr) : QObject(p) - {} + { + } Q_INVOKABLE void toggle(int type); Q_INVOKABLE void save(); diff --git a/src/ui/MxcAnimatedImage.cpp b/src/ui/MxcAnimatedImage.cpp
index 4af527b4..d4f54a69 100644 --- a/src/ui/MxcAnimatedImage.cpp +++ b/src/ui/MxcAnimatedImage.cpp
@@ -193,7 +193,8 @@ MxcAnimatedImage::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeD } QSizeF r = img.size(); - r.scale(size(), Qt::KeepAspectRatio); + if (height() != 0 || width() != 0) + r.scale(size(), Qt::KeepAspectRatio); n->setRect((width() - r.width()) / 2, (height() - r.height()) / 2, r.width(), r.height()); n->setFiltering(QSGTexture::Linear); diff --git a/src/ui/NhekoCursorShape.cpp b/src/ui/NhekoCursorShape.cpp
index 10a6ddab..1c5918b4 100644 --- a/src/ui/NhekoCursorShape.cpp +++ b/src/ui/NhekoCursorShape.cpp
@@ -10,7 +10,8 @@ NhekoCursorShape::NhekoCursorShape(QQuickItem *parent) : QQuickItem(parent) , currentShape_(Qt::CursorShape::ArrowCursor) -{} +{ +} Qt::CursorShape NhekoCursorShape::cursorShape() const diff --git a/src/ui/UIA.h b/src/ui/UIA.h
index 150b595d..9d673dea 100644 --- a/src/ui/UIA.h +++ b/src/ui/UIA.h
@@ -20,7 +20,8 @@ public: UIA(QObject *parent = nullptr) : QObject(parent) - {} + { + } mtx::http::UIAHandler genericHandler(QString context); diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h
index 4652a72e..0f993928 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h
@@ -45,7 +45,8 @@ public: , verification_status(verification_status_) , lastIp(lastIp_) , lastTs(lastTs_) - {} + { + } DeviceInfo(const QString deviceID, const QString displayName, verification::Status verification_status_) @@ -53,10 +54,12 @@ public: , display_name(displayName) , verification_status(verification_status_) , lastTs(0) - {} + { + } DeviceInfo() : verification_status(verification::UNVERIFIED) - {} + { + } QString device_id; QString display_name;