From eb7332e363a0649fd5f54070d2a770de90230bf4 Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Tue, 15 Dec 2020 11:50:16 +0100
Subject: [PATCH] misc: small ui fixes
- fix label override on wizardview
- set theme dependent color for settings -> chatview label, back arrow
- avoid using mipmap for media settings checkbox
Gitlab: #192, #220, #221
Change-Id: Ie7ec6048eebde373dbf45cc1df91864ef9cbcee8
---
src/settingsview/components/ChatviewSettings.qml | 1 +
src/settingsview/components/MediaCodecDelegate.qml | 2 ++
src/settingsview/components/SettingsHeader.qml | 3 ++-
src/wizardview/components/CreateAccountPage.qml | 3 ---
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml
index a10952916..f62de089a 100644
--- a/src/settingsview/components/ChatviewSettings.qml
+++ b/src/settingsview/components/ChatviewSettings.qml
@@ -41,6 +41,7 @@ ColumnLayout {
text: JamiStrings.chatview
font.pointSize: JamiTheme.headerFontSize
font.kerning: true
+ color: JamiTheme.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
diff --git a/src/settingsview/components/MediaCodecDelegate.qml b/src/settingsview/components/MediaCodecDelegate.qml
index baefc207d..0774e519d 100644
--- a/src/settingsview/components/MediaCodecDelegate.qml
+++ b/src/settingsview/components/MediaCodecDelegate.qml
@@ -64,6 +64,8 @@ ItemDelegate {
effect: ColorOverlay {
color: JamiTheme.textColor
}
+ mipmap: false
+ smooth: true
}
width: checkBoxWidth
height: checkBoxWidth
diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml
index 430b0dd37..0dc8be3a2 100644
--- a/src/settingsview/components/SettingsHeader.qml
+++ b/src/settingsview/components/SettingsHeader.qml
@@ -42,7 +42,8 @@ RowLayout {
radius: JamiTheme.preferredFieldHeight
source: "qrc:/images/icons/ic_arrow_back_24px.svg"
- normalColor: JamiTheme.primaryBackgroundColor
+ normalColor: JamiTheme.backgroundColor
+ imageColor: JamiTheme.textColor
toolTipText: JamiStrings.back
hoverEnabled: true
diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml
index 47c2060e0..2a45f80f3 100644
--- a/src/wizardview/components/CreateAccountPage.qml
+++ b/src/wizardview/components/CreateAccountPage.qml
@@ -319,9 +319,6 @@ Rectangle {
color: JamiTheme.textColor
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize
-
- onFontChanged: Layout.preferredHeight =
- JamiQmlUtils.getTextBoundingRect(font, text).height * 2
}
MaterialButton {
--
GitLab