From 64d67234ab1b64065d90c9d60d243ce14a9443c0 Mon Sep 17 00:00:00 2001 From: miruka Date: Sun, 15 Mar 2020 15:17:44 -0400 Subject: [PATCH] Fix room settings background --- TODO.md | 3 +-- src/gui/Pages/Chat/RoomPane/SettingsView.qml | 2 +- src/themes/Glass.qpl | 3 +++ src/themes/Midnight.qpl | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/TODO.md b/TODO.md index 827573d3..3e0b4d7b 100644 --- a/TODO.md +++ b/TODO.md @@ -2,8 +2,8 @@ ## Before release +- Check import function (index tuple error) - Write a real README.md -- Test everything ## Refactoring @@ -112,7 +112,6 @@ - icons.preferredPack: accept multiple values - Find icon packs in user data dir - See [Text.fontSizeMode](https://doc.qt.io/qt-5/qml-qtquick-text.html#fontSizeMode-prop) - - Way to round avatar corners to allow box radius - Settings page - Notifications diff --git a/src/gui/Pages/Chat/RoomPane/SettingsView.qml b/src/gui/Pages/Chat/RoomPane/SettingsView.qml index f103ef4e..a2a4758e 100644 --- a/src/gui/Pages/Chat/RoomPane/SettingsView.qml +++ b/src/gui/Pages/Chat/RoomPane/SettingsView.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts 1.12 import "../../../Base" HBox { - color: "transparent" + color: theme.chat.roomPane.roomSettings.background buttonModel: [ { diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl index e4140a1a..da5b0221 100644 --- a/src/themes/Glass.qpl +++ b/src/themes/Glass.qpl @@ -316,6 +316,9 @@ chat: color moderatorIcon: adminIcon color invitedIcon: hsluv(0, colors.saturation * 2.25, 60) + roomSettings: + color background: colors.mediumBackground + bottomBar: color background: colors.strongBackground diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl index 8023b339..b753a744 100644 --- a/src/themes/Midnight.qpl +++ b/src/themes/Midnight.qpl @@ -326,6 +326,9 @@ chat: color moderatorIcon: adminIcon color invitedIcon: hsluv(0, colors.saturation * 2.25, 60) + roomSettings: + color background: colors.mediumBackground + bottomBar: color background: colors.strongBackground