diff --git a/src/qml/Base/HTabBar.qml b/src/qml/Base/HTabBar.qml new file mode 100644 index 00000000..ac7e1f1b --- /dev/null +++ b/src/qml/Base/HTabBar.qml @@ -0,0 +1,7 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +TabBar { + spacing: 0 + position: TabBar.Header +} diff --git a/src/qml/Base/HTabButton.qml b/src/qml/Base/HTabButton.qml index a77e9661..dc327e4c 100644 --- a/src/qml/Base/HTabButton.qml +++ b/src/qml/Base/HTabButton.qml @@ -32,7 +32,10 @@ TabButton { readonly property alias iconItem: contentItem.icon readonly property alias label: contentItem.label - property color backgroundColor: theme.controls.tab.background + property color backgroundColor: + TabBar.index % 2 == 0 ? + theme.controls.tab.background : theme.controls.tab.alternateBackground + property bool loading: false property HToolTip toolTip: HToolTip { diff --git a/src/qml/Pages/AddChat/AddChat.qml b/src/qml/Pages/AddChat/AddChat.qml index d96d1739..fbb17f7f 100644 --- a/src/qml/Pages/AddChat/AddChat.qml +++ b/src/qml/Pages/AddChat/AddChat.qml @@ -2,6 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import "../../Base" +import "../../utils.js" as Utils HPage { id: addChatPage @@ -17,9 +18,8 @@ HPage { Layout.maximumWidth: Math.max(tabBar.contentWidth, swipeView.contentWidth) - TabBar { + HTabBar { id: tabBar - position: TabBar.Header currentIndex: 2 Layout.fillWidth: true diff --git a/src/themes/Default.qpl b/src/themes/Default.qpl index d98dea36..f6801c23 100644 --- a/src/themes/Default.qpl +++ b/src/themes/Default.qpl @@ -116,6 +116,20 @@ controls: color pressedOverlay: hsluv(0, 0, 50, 0.5) color checkedOverlay: colors.accentBackground + tab: + color text: controls.button.text + color background: controls.button.background + color alternateBackground: hsluv( + colors.hue, + colors.bgSaturation * 1.25, + colors.intensity * 4, + Math.max(0.6, colors.opacity) + ) + + color hoveredOverlay: controls.button.hoveredOverlay + color pressedOverlay: controls.button.pressedOverlay + color checkedOverlay: controls.button.checkedOverlay + menu: color background: controls.button.background color border: "black"