diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-05 01:15:07 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-08 22:32:14 +0200 |
| commit | 04c9eec8a457865557a0576c417d0ba5c412ca5e (patch) | |
| tree | 4385db879538f263b83fec4e96d899ba279d355a /resources | |
| parent | Workaround palette not set on new windows (diff) | |
| download | nheko-04c9eec8a457865557a0576c417d0ba5c412ca5e.tar.xz | |
Fix palette in popups
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/Completer.qml | 3 | ||||
| -rw-r--r-- | resources/qml/ForwardCompleter.qml | 3 | ||||
| -rw-r--r-- | resources/qml/QuickSwitcher.qml | 3 | ||||
| -rw-r--r-- | resources/qml/Root.qml | 12 | ||||
| -rw-r--r-- | resources/qml/ui/Snackbar.qml | 3 |
5 files changed, 18 insertions, 6 deletions
diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml index 00141d4d..eeefe5f0 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml @@ -24,6 +24,9 @@ Control { property int rowMargin: 0 property int rowSpacing: Nheko.paddingSmall + // Workaround palettes not inheriting for popups + palette: timelineRoot.palette + signal completionClicked(string completion) signal completionSelected(string id) diff --git a/resources/qml/ForwardCompleter.qml b/resources/qml/ForwardCompleter.qml index cc48c46f..7ad26491 100644 --- a/resources/qml/ForwardCompleter.qml +++ b/resources/qml/ForwardCompleter.qml @@ -24,6 +24,9 @@ Popup { x: Math.round(parent.width / 2 - width / 2) y: Math.round(parent.height / 4) + // Workaround palettes not inheriting for popups + palette: timelineRoot.palette + Overlay.modal: Rectangle { color: Qt.rgba(palette.window.r, palette.window.g, palette.window.b, 0.7) } diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml index 90e6560c..7d3686ed 100644 --- a/resources/qml/QuickSwitcher.qml +++ b/resources/qml/QuickSwitcher.qml @@ -21,6 +21,9 @@ Popup { x: Math.round(parent.width / 2 - contentWidth / 2) y: Math.round(parent.height / 4) + // Workaround palettes not inheriting for popups + palette: timelineRoot.palette + Overlay.modal: Rectangle { color: "#aa1E1E1E" } diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index cb000040..b869f95a 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml @@ -10,12 +10,12 @@ import "./pages" import "./voip" import "./ui" import Qt.labs.platform 1.1 as Platform -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.3 -import QtQuick.Window 2.15 -import im.nheko 1.0 -import im.nheko.EmojiModel 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Window +import im.nheko +import im.nheko.EmojiModel Pane { id: timelineRoot diff --git a/resources/qml/ui/Snackbar.qml b/resources/qml/ui/Snackbar.qml index b3530522..0d334079 100644 --- a/resources/qml/ui/Snackbar.qml +++ b/resources/qml/ui/Snackbar.qml @@ -9,6 +9,9 @@ import im.nheko 1.0 Popup { id: snackbar + // Workaround palettes not inheriting for popups + palette: timelineRoot.palette + property var messages: [] property string currentMessage: "" |