File 2002-temp.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2002-temp.patch of Package spectacle (Revision 9397bd34ef609ba90f49dc97784fc38e)

Currently displaying revision 9397bd34ef609ba90f49dc97784fc38e , Show latest

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd65b9b5..d8dc091e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,6 +144,7 @@ qt_add_qml_module(spectacle
     Gui/AnnotationsToolBarContents.qml
     Gui/ButtonGrid.qml
     Gui/CaptureModeButtonsColumn.qml
+    Gui/CaptureModeTabBar.qml
     Gui/CaptureOptions.qml
     Gui/CaptureSettingsColumn.qml
     Gui/CopiedMessage.qml
diff --git a/src/Gui/CaptureModeTabBar.qml b/src/Gui/CaptureModeTabBar.qml
new file mode 100644
index 00000000..38fe6e58
--- /dev/null
+++ b/src/Gui/CaptureModeTabBar.qml
@@ -0,0 +1,62 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC
+import org.kde.kirigami as Kirigami
+
+Kirigami.AbstractApplicationHeader {
+    id: root
+
+    property int currentIndex: 0
+
+    RowLayout {
+        width: root.width
+
+        TabButton {
+            Layout.fillWidth: true
+            checked: root.currentIndex === 0
+            icon.name: "camera-photo"
+            text: i18nc("@title:tab", "Screenshot")
+
+            onClicked: root.currentIndex = 0
+        }
+
+        TabButton {
+            Layout.fillWidth: true
+            checked: root.currentIndex === 1
+            icon.name: "camera-photo"
+            text: i18nc("@title:tab", "Recording")
+
+            onClicked: root.currentIndex = 1
+        }
+    }
+
+    component TabButton: Kirigami.NavigationTabButton {
+        id: button
+        autoExclusive: true
+        checkable: true
+        display: QQC.AbstractButton.TextBesideIcon
+        padding: Kirigami.Units.gridUnit / 2
+        contentItem: Item {
+            implicitWidth: row.implicitWidth
+            implicitHeight: row.implicitHeight
+
+            RowLayout {
+                id: row
+                anchors.centerIn: parent
+                width: Math.min(implicitWidth, parent.width)
+
+                Kirigami.Icon {
+                    implicitWidth: button.icon.width
+                    implicitHeight: button.icon.height
+                    source: button.icon.name
+                }
+
+                QQC.Label {
+                    Layout.fillWidth: true
+                    elide: Text.ElideRight
+                    text: button.text
+                }
+            }
+        }
+    }
+}
diff --git a/src/Gui/DialogPage.qml b/src/Gui/DialogPage.qml
index 89679ed3..1c6c82e1 100644
--- a/src/Gui/DialogPage.qml
+++ b/src/Gui/DialogPage.qml
@@ -154,6 +154,11 @@ EmptyPage {
         }
     }
 
+    header: CaptureModeTabBar {
+        id: tabBar
+        visible: VideoPlatform.supportedRecordingModes && !SpectacleCore.isRecording
+    }
+
     // Not ColumnLayout because layouts don't work well with animations.
     contentItem: Column {
         spacing: Kirigami.Units.mediumSpacing * 2
@@ -170,73 +175,14 @@ EmptyPage {
                 }
             }
         }
-        Loader {
-            width: Math.max(parent.width, implicitWidth)
-            active: VideoPlatform.supportedRecordingModes
-            visible: active
-            sourceComponent: Row {
-                // We don't want the visuals of a tab because they don't look nice here with
-                // qqc2-desktop-style, but this is functionally a tab.
-                // Maybe use a segmented control style in the future when one becomes available.
-                QQC.ToolButton {
-                    id: screenshotHeadingButton
-                    Accessible.role: Accessible.PageTab
-                    width: Math.max(parent.width / 2, dprRound(implicitWidth), dprRound(recordingHeadingButton.implicitWidth))
-                    height: Math.max(parent.height, dprRound(implicitHeight), dprRound(recordingHeadingButton.implicitHeight))
-                    // Extend the clickable area between the buttons
-                    leftInset: !mirrored ? 0 : Kirigami.Units.mediumSpacing
-                    rightInset: mirrored ? 0 : Kirigami.Units.mediumSpacing
-                    padding: Kirigami.Units.mediumSpacing * 2
-                    // Visually compensate for inset to make it look like spacing
-                    leftPadding: padding + leftInset
-                    rightPadding: padding + rightInset
-                    // Make the padding look more even with Latin-like scripts.
-                    // There should still be more than enough space for other scripts.
-                    topPadding: Math.max(0, padding - headingFontMetrics.descent)
-                    bottomPadding: Math.max(0, padding - headingFontMetrics.descent)
-                    // We do `pointSize * sqrt(2)` because `pointSize * 2` would actually result
-                    // in a font that uses 4x more area than the base font would have.
-                    font.pointSize: Application.font.pointSize * 1.414213562373095
-                    text: i18nc("@title:tab", "Screenshot")
-                    checkable: true
-                    checked: true
-                    autoExclusive: true
-                    FontMetrics {
-                        id: headingFontMetrics
-                        font: screenshotHeadingButton.font
-                    }
-                    onCheckedChanged: if (checked && contentLoader.sourceComponent !== screenshotComponent) {
-                        contentLoader.sourceComponent = screenshotComponent
-                    }
-                }
-
-                QQC.ToolButton {
-                    id: recordingHeadingButton
-                    Accessible.role: screenshotHeadingButton.Accessible.role
-                    width: screenshotHeadingButton.width
-                    height: screenshotHeadingButton.height
-                    leftInset: !mirrored ? Kirigami.Units.mediumSpacing : 0
-                    rightInset: mirrored ? Kirigami.Units.mediumSpacing : 0
-                    padding: screenshotHeadingButton.padding
-                    leftPadding: padding + leftInset
-                    rightPadding: padding + rightInset
-                    topPadding: screenshotHeadingButton.topPadding
-                    bottomPadding: screenshotHeadingButton.bottomPadding
-                    font: screenshotHeadingButton.font
-                    text: i18nc("@title:tab", "Recording")
-                    checkable: true
-                    checked: false
-                    autoExclusive: true
-                    onCheckedChanged: if (checked && contentLoader.sourceComponent !== recordingComponent) {
-                        contentLoader.sourceComponent = recordingComponent
-                    }
-                }
-            }
-        }
         Loader {
             id: contentLoader
             width: Math.max(parent.width, implicitWidth)
-            sourceComponent: screenshotComponent
+            sourceComponent: switch (tabBar.currentIndex) {
+                case 0: return screenshotComponent
+                case 1: return recordingComponent
+                default: return null
+            }
         }
     }
 
diff --git a/src/Gui/ImageView.qml b/src/Gui/ImageView.qml
index 7807f063..80e74ae9 100644
--- a/src/Gui/ImageView.qml
+++ b/src/Gui/ImageView.qml
@@ -148,40 +148,18 @@ EmptyPage {
             topPadding: Kirigami.Units.mediumSpacing * 2
             bottomPadding: Kirigami.Units.mediumSpacing * 2
 
-            header: PC3.TabBar {
+            header: CaptureModeTabBar {
                 id: tabBar
                 visible: VideoPlatform.supportedRecordingModes && !SpectacleCore.isRecording
-                currentIndex: 0
-                background: Rectangle {
-                    Kirigami.Theme.colorSet: Kirigami.Theme.View
-                    color: Kirigami.Theme.alternateBackgroundColor
-
+                background: Kirigami.InlineViewHeader {
                     Kirigami.Separator {
                         anchors {
-                            left: parent.left
                             top: parent.top
                             bottom: parent.bottom
-                        }
-                    }
-
-                    Kirigami.Separator {
-                        anchors {
                             left: parent.left
-                            right: parent.right
-                            bottom: parent.bottom
                         }
                     }
                 }
-
-                PC3.TabButton {
-                    width: tabBar.width / tabBar.count
-                    text: i18n("Screenshot")
-                }
-
-                PC3.TabButton {
-                    width: tabBar.width / tabBar.count
-                    text: i18n("Recording")
-                }
             }
 
             contentItem: Loader {

Places

File 2002-temp.patch of Package spectacle (Revision 9397bd34ef609ba90f49dc97784fc38e)

Places