From ede99b310e8b58a30badbfd5d64b1f1aa47d18e5 Mon Sep 17 00:00:00 2001 From: miruka Date: Wed, 19 Aug 2020 10:09:37 -0400 Subject: [PATCH] Fix login box tab shortcuts --- src/gui/Base/HTabBar.qml | 3 +++ src/gui/Pages/AddAccount/AddAccount.qml | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/Base/HTabBar.qml b/src/gui/Base/HTabBar.qml index a1a75fba..2c7cfb6b 100644 --- a/src/gui/Base/HTabBar.qml +++ b/src/gui/Base/HTabBar.qml @@ -7,6 +7,8 @@ import "../ShortcutBundles" TabBar { id: tabBar + property alias shortcutsEnabled: tabShortcuts.active + spacing: 0 position: TabBar.Header @@ -20,6 +22,7 @@ TabBar { } TabShortcuts { + id: tabShortcuts container: tabBar } } diff --git a/src/gui/Pages/AddAccount/AddAccount.qml b/src/gui/Pages/AddAccount/AddAccount.qml index 52cba071..932a78a7 100644 --- a/src/gui/Pages/AddAccount/AddAccount.qml +++ b/src/gui/Pages/AddAccount/AddAccount.qml @@ -1,10 +1,11 @@ // SPDX-License-Identifier: LGPL-3.0-or-later import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import "../../Base" -HSwipeView { +SwipeView { id: swipeView clip: true interactive: serverBrowser.acceptedUrl @@ -38,6 +39,7 @@ HSwipeView { height: Math.min(implicitHeight, tabPage.availableHeight) header: HTabBar { + shortcutsEnabled: visible && tabPage.enabled visible: signInLoader.sourceComponent !== signInLoader.signInSso