Skip to content
Snippets Groups Projects
Commit 7b034844 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Sébastien Blin
Browse files

misc: fix some frameless window hit-test issues

- Moves the plugin settings close(on GNU/Linux and Windows) to the left to avoid a visual conflict with the system buttons.
- Adds hit testability to BackButton.qml

Note: this commit does not address the style difference in the back buttons thoughout the onboarding pages.
Change-Id: Ia4a2ce2a1228888e3c3101f3472fbe1843b4a522
parent 4d29e11c
No related branches found
Tags beta/202402071743
No related merge requests found
......@@ -42,4 +42,6 @@ PushButton {
keyEvent.accepted = true;
}
}
QWKSetParentHitTestVisible {}
}
......@@ -80,25 +80,19 @@ Item {
}
}
contentItem: ColumnLayout {
width: parent.width
JamiPushButton {
JamiPushButton { QWKSetParentHitTestVisible {}
id: closeButton
readonly property bool alignLeft: Qt.platform.os.toString() !== "osx"
normalColor: Qt.rgba(124, 124, 124, 0.36)
hoveredColor: Qt.rgba(124, 124, 124, 0.75)
Layout.alignment: Qt.AlignRight
Layout.alignment: alignLeft ? Qt.AlignLeft : Qt.AlignRight
Layout.leftMargin: 10
Layout.rightMargin: 30
Layout.topMargin: 10
Layout.rightMargin: 35
Layout.preferredWidth: JamiTheme.preferredFieldHeight
Layout.preferredHeight: childrenRect.height
imageColor: JamiTheme.blackColor
toolTipText: JamiStrings.closeSettings
preferredSize: 32
source: JamiResources.round_close_24dp_svg
onClicked: {
closed();
}
onClicked: closed()
}
ResponsiveImage {
......
......@@ -29,7 +29,7 @@ RowLayout {
signal backArrowClicked
spacing: 10
BackButton { QWKSetParentHitTestVisible {}
BackButton {
id: backToSettingsMenuButton
Layout.preferredWidth: JamiTheme.preferredFieldHeight
......
......@@ -33,7 +33,7 @@ BaseView {
inhibits: ["ConversationView"]
color: JamiTheme.backgroundColor
color: JamiTheme.secondaryBackgroundColor
Connections {
target: AccountAdapter
......@@ -90,6 +90,7 @@ BaseView {
property ScrollBar vScrollBar: ScrollBar.vertical
anchors.fill: parent
anchors.topMargin: appWindow.useFrameless && Qt.platform.os.toString() === "osx" ? 16 : 0
contentHeight: controlPanelStackView.height
boundsBehavior: Flickable.StopAtBounds
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment