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

UI logic tweaking.

Browse Source
This commit is contained in:
Black Hat
2018-09-13 11:58:02 +08:00
parent 1169a0c4d1
commit 3ef1744b5c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/util.js
View File

@@ -18,8 +18,8 @@ function pushToStack(stack, page) {
if(stack.depth === 1) { if(stack.depth === 1) {
stack.replace(page) stack.replace(page)
} else { } else {
stack.clear() stack.pop(null)
stack.push(page) stack.replace(page)
} }
} }
} }

3
qml/main.qml
View File

@@ -9,6 +9,7 @@ import Matrique.Settings 0.1
import "component" import "component"
import "form" import "form"
import "qrc:/js/util.js" as Util
ApplicationWindow { ApplicationWindow {
readonly property var currentConnection: accountListView.currentConnection ? accountListView.currentConnection : null readonly property var currentConnection: accountListView.currentConnection ? accountListView.currentConnection : null
@@ -131,7 +132,7 @@ ApplicationWindow {
hint: user.displayName hint: user.displayName
image: user.avatar image: user.avatar
defaultColor: Material.accent defaultColor: Util.stringToColor(user.displayName)
} }
highlightColor: matriqueController.color(user.id) highlightColor: matriqueController.color(user.id)