ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change m.notice background color.

Browse Source
This commit is contained in:
Black Hat
2018-09-06 21:00:58 +08:00
parent 96874cba06
commit a189927b67
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qml/component/MessageDelegate.qml
View File

@@ -7,7 +7,7 @@ import Matrique.Settings 0.1
RowLayout { RowLayout {
readonly property bool avatarVisible: !(sentByMe || (aboveAuthor === author && section === aboveSection)) readonly property bool avatarVisible: !(sentByMe || (aboveAuthor === author && section === aboveSection))
readonly property bool highlighted: !sentByMe readonly property bool highlighted: !(sentByMe || eventType === "notice" )
readonly property bool sentByMe: author === currentRoom.localUser readonly property bool sentByMe: author === currentRoom.localUser
readonly property bool isText: eventType === "notice" || eventType === "message" readonly property bool isText: eventType === "notice" || eventType === "message"
@@ -47,7 +47,7 @@ RowLayout {
id: genericBubble id: genericBubble
highlighted: !sentByMe highlighted: messageRow.highlighted
colored: highlighted && (eventType === "notice" || highlight) colored: highlighted && (eventType === "notice" || highlight)
contentItem: ColumnLayout { contentItem: ColumnLayout {

11
qml/main.qml
View File

@@ -36,7 +36,16 @@ ApplicationWindow {
Controller { Controller {
id: matriqueController id: matriqueController
onToggleWindow: window.visible ? window.hide() : window.show() onToggleWindow: {
console.log("Activating window...")
if (window.visible) {
window.hide()
} else {
window.show()
window.raise()
window.requestActivate()
}
}
} }
Popup { Popup {