File 2002-temp.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2002-temp.patch of Package spectacle (Revision 67b49fccd79fc9346c5d342a6e6b849c)

Currently displaying revision 67b49fccd79fc9346c5d342a6e6b849c , Show latest

diff --git a/src/Gui/DialogPage.qml b/src/Gui/DialogPage.qml
index 89679ed3..fa71ebf5 100644
--- a/src/Gui/DialogPage.qml
+++ b/src/Gui/DialogPage.qml
@@ -154,6 +154,36 @@ EmptyPage {
         }
     }
 
+    header: RowLayout {
+        id: tabBar
+
+        property int currentIndex: 0
+
+        QQC.Button {
+            Layout.fillWidth: true
+            autoExclusive: true
+            checkable: true
+            checked: tabBar.currentIndex === 0
+            flat: true
+            icon.name: "camera-photo"
+            text: "Screenshot"
+
+            onClicked: tabBar.currentIndex = 0
+        }
+
+        QQC.Button {
+            Layout.fillWidth: true
+            autoExclusive: true
+            checkable: true
+            checked: tabBar.currentIndex === 1
+            flat: true
+            icon.name: "camera-video"
+            text: "Recording"
+
+            onClicked: tabBar.currentIndex = 1
+        }
+    }
+
     // Not ColumnLayout because layouts don't work well with animations.
     contentItem: Column {
         spacing: Kirigami.Units.mediumSpacing * 2
@@ -170,73 +200,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..68a59358 100644
--- a/src/Gui/ImageView.qml
+++ b/src/Gui/ImageView.qml
@@ -148,39 +148,45 @@ EmptyPage {
             topPadding: Kirigami.Units.mediumSpacing * 2
             bottomPadding: Kirigami.Units.mediumSpacing * 2
 
-            header: PC3.TabBar {
-                id: tabBar
+            header: RowLayout {
+                spacing: 0
                 visible: VideoPlatform.supportedRecordingModes && !SpectacleCore.isRecording
-                currentIndex: 0
-                background: Rectangle {
-                    Kirigami.Theme.colorSet: Kirigami.Theme.View
-                    color: Kirigami.Theme.alternateBackgroundColor
 
-                    Kirigami.Separator {
-                        anchors {
-                            left: parent.left
-                            top: parent.top
-                            bottom: parent.bottom
-                        }
-                    }
+                Kirigami.Separator {
+                    Layout.fillHeight: true
+                }
+
+                Kirigami.InlineViewHeader {
+                    Layout.fillWidth: true
+                    contentItem: RowLayout {
+                        id: tabBar
 
-                    Kirigami.Separator {
-                        anchors {
-                            left: parent.left
-                            right: parent.right
-                            bottom: parent.bottom
+                        property int currentIndex: 0
+
+                        QQC.Button {
+                            Layout.fillWidth: true
+                            autoExclusive: true
+                            checkable: true
+                            checked: tabBar.currentIndex === 0
+                            flat: true
+                            icon.name: "camera-photo"
+                            text: "Screenshot"
+
+                            onClicked: tabBar.currentIndex = 0
                         }
-                    }
-                }
 
-                PC3.TabButton {
-                    width: tabBar.width / tabBar.count
-                    text: i18n("Screenshot")
-                }
+                        QQC.Button {
+                            Layout.fillWidth: true
+                            autoExclusive: true
+                            checkable: true
+                            checked: tabBar.currentIndex === 1
+                            flat: true
+                            icon.name: "camera-video"
+                            text: "Recording"
 
-                PC3.TabButton {
-                    width: tabBar.width / tabBar.count
-                    text: i18n("Recording")
+                            onClicked: tabBar.currentIndex = 1
+                        }
+                    }
                 }
             }

Places

File 2002-temp.patch of Package spectacle (Revision 67b49fccd79fc9346c5d342a6e6b849c)

Places