disable emoji parsing code on android for now to enable typing
This commit is contained in:
parent
90c9405b7e
commit
0f81b4430a
|
@ -23,6 +23,7 @@ type GrandCentralDispatcher struct {
|
||||||
QMLEngine *qml.QQmlApplicationEngine
|
QMLEngine *qml.QQmlApplicationEngine
|
||||||
Translator *core.QTranslator
|
Translator *core.QTranslator
|
||||||
|
|
||||||
|
_ string `property:"os"`
|
||||||
_ string `property:"currentOpenConversation"`
|
_ string `property:"currentOpenConversation"`
|
||||||
_ float32 `property:"themeScale"`
|
_ float32 `property:"themeScale"`
|
||||||
|
|
||||||
|
|
1
main.go
1
main.go
|
@ -43,6 +43,7 @@ func main() {
|
||||||
|
|
||||||
// our globals
|
// our globals
|
||||||
gcd := gothings.NewGrandCentralDispatcher(nil)
|
gcd := gothings.NewGrandCentralDispatcher(nil)
|
||||||
|
gcd.SetOs(runtime.GOOS)
|
||||||
gcd.UIState = gothings.NewUIState(gcd)
|
gcd.UIState = gothings.NewUIState(gcd)
|
||||||
the.AcknowledgementIDs = make(map[string][]*the.AckId)
|
the.AcknowledgementIDs = make(map[string][]*the.AckId)
|
||||||
gcd.OutgoingMessages = make(chan gobjects.Letter, 1000)
|
gcd.OutgoingMessages = make(chan gobjects.Letter, 1000)
|
||||||
|
|
|
@ -139,7 +139,7 @@ ColumnLayout {
|
||||||
property bool skipOneUpdate: false
|
property bool skipOneUpdate: false
|
||||||
|
|
||||||
Keys.onReturnPressed: { // CTRL+ENTER = LINEBREAK
|
Keys.onReturnPressed: { // CTRL+ENTER = LINEBREAK
|
||||||
if (event.modifiers & Qt.ControlModifier) {
|
if ((event.modifiers & Qt.ControlModifier) && gcd.os != "android") {
|
||||||
txtMessage.insert(txtMessage.cursorPosition, "<br>")
|
txtMessage.insert(txtMessage.cursorPosition, "<br>")
|
||||||
} else if (event.modifiers == Qt.NoModifier) {
|
} else if (event.modifiers == Qt.NoModifier) {
|
||||||
btnSend.clicked()
|
btnSend.clicked()
|
||||||
|
@ -150,6 +150,10 @@ ColumnLayout {
|
||||||
// while also stripping any other tag, including other images.
|
// while also stripping any other tag, including other images.
|
||||||
// TODO: this probably breaks if people actually do want to paste html
|
// TODO: this probably breaks if people actually do want to paste html
|
||||||
onTextChanged: {
|
onTextChanged: {
|
||||||
|
if (gcd.os == "android") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
//console.log("onTextChanged()")
|
//console.log("onTextChanged()")
|
||||||
|
|
||||||
// we're taking advantage of TextEdit.getText()'s parsing capability, which means occasionally
|
// we're taking advantage of TextEdit.getText()'s parsing capability, which means occasionally
|
||||||
|
@ -269,4 +273,4 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue