summary refs log tree commit diff
path: root/include/ui
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-11-22 19:09:19 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-11-22 19:09:19 +0200
commit929b2df6fb28a1e431027afb032f5eeefd0106b7 (patch)
tree1382bcf577b1ea9ef7e1fb7b812a4f28f30bb9bf /include/ui
parentKeep track of newly joined rooms in the settings manager (diff)
parentUse system color scheme (using a Qt stylesheet) #104 (diff)
downloadnheko-929b2df6fb28a1e431027afb032f5eeefd0106b7.tar.xz
Merge branch 'theme'
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/LoadingIndicator.h1
-rw-r--r--include/ui/OverlayWidget.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/ui/LoadingIndicator.h b/include/ui/LoadingIndicator.h

index 75920dd8..bb33fe6c 100644 --- a/include/ui/LoadingIndicator.h +++ b/include/ui/LoadingIndicator.h
@@ -9,6 +9,7 @@ class LoadingIndicator : public QWidget { Q_OBJECT + Q_PROPERTY(QColor color READ color WRITE setColor) public: LoadingIndicator(QWidget *parent = 0); diff --git a/include/ui/OverlayWidget.h b/include/ui/OverlayWidget.h
index 2984e469..6662479d 100644 --- a/include/ui/OverlayWidget.h +++ b/include/ui/OverlayWidget.h
@@ -1,6 +1,8 @@ #pragma once #include <QEvent> +#include <QPainter> +#include <QStyleOption> #include <QWidget> class OverlayWidget : public QWidget @@ -15,4 +17,5 @@ protected: bool eventFilter(QObject *obj, QEvent *event) override; QRect overlayGeometry() const; + void paintEvent(QPaintEvent *event) override; };