cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge pull request 'dark theme fixes' (#321) from dan/ui:06-darkthemeContacts into master
the build was successful Details 

Reviewed-on: #321
This commit is contained in:
erinn 2020-08-31 16:08:20 -07:00
parent 21201d2e68 27a09dd8cb
commit c55a6b196a
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qml/main.qml
View File

@ -273,7 +273,7 @@ ApplicationWindow {
if (currentIndex == managementPane) { if (currentIndex == managementPane) {
toolbar.hideTitle() toolbar.hideTitle()
toolbar.rightMenuVisible = false toolbar.rightMenuVisible = false
toolbar.color = Theme.backgroundMainColor toolbar.color = Theme.toolbarMainColor
toolbar.leftMenuVisible = true toolbar.leftMenuVisible = true
toolbar.backVisible = false toolbar.backVisible = false
} else { } else {
@ -283,9 +283,9 @@ ApplicationWindow {
if (currentIndex == profilePane && theStack.currentIndex == theStack.emptyPane) { if (currentIndex == profilePane && theStack.currentIndex == theStack.emptyPane) {
toolbar.hideTitle() toolbar.hideTitle()
toolbar.rightMenuVisible = false toolbar.rightMenuVisible = false
toolbar.color = Theme.backgroundMainColor toolbar.color = Theme.toolbarMainColor
} else { } else {
toolbar.color = Theme.backgroundPaneColor toolbar.color = Theme.toolbarAltColor
} }
} }
} }

2
qml/opaque

@ -1 +1 @@
Subproject commit 60c6a8d9838df0a83b7e0faf06a4d6d01b4eb0a0 Subproject commit ec21dcbf8e20f4f894ba0dc829ccf18f56e0d27a

12
qml/widgets/MessageEditor.qml
View File

@ -254,9 +254,9 @@ ColumnLayout {
height: 36 * gcd.themeScale height: 36 * gcd.themeScale
width: 48 * gcd.themeScale width: 48 * gcd.themeScale
backgroundColor: enabled ? Theme.backgroundMainColor : Theme.backgroundPaneColor backgroundColor: enabled ? Theme.altButtonColor : Theme.altButtonDisabledColor
hilightBackgroundColor: Theme.backgroundPaneColor hilightBackgroundColor: backgroundColor
iconColor: Theme.dividerColor iconColor: enabled ? Theme.altButtonTextColor : Theme.altButtonDisabledTextColor
onClicked: emojiDrawer.visible ? emojiDrawer.slideclosed() : emojiDrawer.slideopen() onClicked: emojiDrawer.visible ? emojiDrawer.slideclosed() : emojiDrawer.slideopen()
} }
@ -269,9 +269,9 @@ ColumnLayout {
height: 36 * gcd.themeScale height: 36 * gcd.themeScale
width: 48 * gcd.themeScale width: 48 * gcd.themeScale
backgroundColor: enabled ? Theme.backgroundMainColor : Theme.backgroundPaneColor backgroundColor: enabled ? Theme.altButtonColor : Theme.altButtonDisabledColor
hilightBackgroundColor: Theme.backgroundPaneColor hilightBackgroundColor: backgroundColor
iconColor: Theme.dividerColor iconColor: enabled ? Theme.altButtonTextColor : Theme.altButtonDisabledTextColor
onClicked: { onClicked: {
gcd.popup("attachments not yet implemented, sorry") gcd.popup("attachments not yet implemented, sorry")

3
qml/widgets/MyProfile.qml
View File

@ -10,6 +10,7 @@ import QtQuick.Controls 1.4
import "../opaque" as Opaque import "../opaque" as Opaque
import "../opaque/styles" import "../opaque/styles"
import "../opaque/theme" import "../opaque/theme"
import "../opaque/fonts"
Item { Item {
id: root id: root
@ -110,6 +111,8 @@ Item {
color: Theme.portraitOnlineTextColor color: Theme.portraitOnlineTextColor
size: Theme.usernameSize * gcd.themeScale size: Theme.usernameSize * gcd.themeScale
weight: Font.Bold weight: Font.Bold
font.family: Fonts.applicationFontExtraBold.name
font.styleName: "ExtraBold"
text: nick text: nick
extraPadding: addBtn.width + 30 extraPadding: addBtn.width + 30
container: nameRow container: nameRow