d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-21 18:50:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1572 from Nheko-Reborn/differentiateTouch

Browse source 
Qt 6.4 properly supports scrolling text with touch
This commit is contained in:
DeepBlueV7.X 2023-10-01 12:55:36 +00:00 committed by GitHub
commit 79a32bea50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/MatrixText.qml
View file

@ -2,9 +2,9 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.5
import QtQuick.Controls 2.3
import im.nheko 1.0
import QtQuick
import QtQuick.Controls
import im.nheko
TextEdit {
id: r
@ -28,7 +28,6 @@ TextEdit {
color: palette.text
focus: false
readOnly: true
selectByMouse: !Settings.mobileMode
textFormat: TextEdit.RichText
wrapMode: Text.Wrap

8
resources/qml/delegates/TextMessage.qml
View file

@ -3,8 +3,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import ".."
import QtQuick.Controls 2.3
import im.nheko 1.0
import QtQuick.Controls
import im.nheko
MatrixText {
required property string body
@ -42,8 +42,8 @@ MatrixText {
width: parent?.width ?? 0
height: !keepFullText ? Math.round(Math.min(timelineView.height / 8, implicitHeight)) : implicitHeight
clip: !keepFullText
selectByMouse: !Settings.mobileMode && !isReply
enabled: !Settings.mobileMode
selectByMouse: !isReply
// enabled: !Settings.mobileMode
font.pointSize: (Settings.enlargeEmojiOnlyMessages && isOnlyEmoji > 0 && isOnlyEmoji < 4) ? Settings.fontSize * 3 : Settings.fontSize
NhekoCursorShape {

7
resources/qml/dialogs/RawMessageDialog.qml
View file

@ -2,9 +2,9 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15
import QtQuick.Controls 2.15
import im.nheko 1.0
import QtQuick
import QtQuick.Controls
import im.nheko
ApplicationWindow {
id: rawMessageRoot
@ -32,7 +32,6 @@ ApplicationWindow {
font: Nheko.monospaceFont()
color: palette.text
readOnly: true
selectByMouse: !Settings.mobileMode
textFormat: Text.PlainText
anchors.fill: parent

1
resources/qml/dialogs/RoomSettings.qml
View file

@ -208,7 +208,6 @@ ApplicationWindow {
: (roomSettings.plainRoomTopic === "" ? ("<i>" + qsTr("No topic set") + "</i>") : roomSettings.roomTopic)
wrapMode: TextEdit.WordWrap
background: null
selectByMouse: !Settings.mobileMode
color: palette.text
horizontalAlignment: TextEdit.AlignHCenter
onLinkActivated: Nheko.openLink(link)

13
resources/qml/pages/UserSettingsPage.qml
View file

@ -5,12 +5,12 @@
pragma ComponentBehavior: Bound
import ".."
import "../ui"
import Qt.labs.platform 1.1 as Platform
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.2
import QtQuick.Window 2.15
import im.nheko 1.0
import Qt.labs.platform as Platform
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Window
import im.nheko
Rectangle {
id: userSettingsDialog
@ -163,7 +163,6 @@ Rectangle {
color: palette.text
text: model.value
readOnly: true
selectByMouse: !Settings.mobileMode
textFormat: Text.PlainText
}
}