File 2000-toolbars.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2000-toolbars.patch of Package spectacle (Revision 1022404d3c8f0064d8b0feb78bd982bd)

Currently displaying revision 1022404d3c8f0064d8b0feb78bd982bd , Show latest

diff --git a/src/Gui/ButtonGrid.qml b/src/Gui/ButtonGrid.qml
index e14c30e7..e9d1388b 100644
--- a/src/Gui/ButtonGrid.qml
+++ b/src/Gui/ButtonGrid.qml
@@ -10,7 +10,7 @@ import org.kde.spectacle.private 1.0
 
 Grid {
     id: root
-    property int displayMode: QQC2.AbstractButton.TextBesideIcon
+    property int displayMode: QQC2.AbstractButton.IconOnly
     property int focusPolicy: Qt.StrongFocus
     readonly property real fullButtonHeight: iconTextButtonMetrics.implicitHeight
     readonly property bool mirrored: effectiveLayoutDirection === Qt.RightToLeft
diff --git a/src/Gui/ImageCaptureOverlay.qml b/src/Gui/ImageCaptureOverlay.qml
index 76f963cd..445c6a65 100644
--- a/src/Gui/ImageCaptureOverlay.qml
+++ b/src/Gui/ImageCaptureOverlay.qml
@@ -368,7 +368,7 @@ MouseArea {
             contentItem: MainToolBarContents {
                 id: mainToolBarContents
                 focusPolicy: Qt.NoFocus
-                displayMode: QQC2.AbstractButton.TextBesideIcon
+                displayMode: QQC2.AbstractButton.IconOnly
                 showSizeLabel: mainToolBar.valignment === ssToolTip.valignment
                 imageSize: Selection.alignedSize(Selection.width,
                                                 Selection.height,
@@ -409,10 +409,10 @@ MouseArea {
 
             Binding on x {
                 value: {
-                    const min = mainToolBar.x
-                    const target = contextWindow.dprRound(mainToolBar.x + (mainToolBar.width - atbLoader.width) / 2)
-                    const max = mainToolBar.x + mainToolBar.width - atbLoader.width
-                    return Math.max(min, Math.min(target, max))
+                    const min = mainToolBar.leftPadding
+                    const target = contextWindow.dprRound(mainToolBar.x - (atbLoader.width - mainToolBar.width) / 2)
+                    const max = SelectionEditor.screensRect.width - atbLoader.width - mainToolBar.rightPadding
+                    return Math.max(min, Math.min(contextWindow.dprRound(target), max))
                 }
                 when: !atbLoader.rememberPosition
                 restoreMode: Binding.RestoreNone
diff --git a/src/Gui/ImageView.qml b/src/Gui/ImageView.qml
index d7641fcb..7a310885 100644
--- a/src/Gui/ImageView.qml
+++ b/src/Gui/ImageView.qml
@@ -26,8 +26,8 @@ EmptyPage {
     // Used in ViewerWindow::setMode()
     readonly property real minimumWidth: Math.max(
         header.implicitWidth,
-
-        annotationsToolBar.implicitWidth + separator.implicitWidth + footerLoader.implicitWidth
+        annotationsToolBar.implicitWidth + separator.implicitWidth + footerLoader.implicitWidth,
+        captureOptionsLoader.implicitHeight + captureOptionsLoader.implicitWidth
     )
     readonly property real minimumHeight: header.implicitHeight
         + Math.max(annotationsToolBar.implicitHeight,
@@ -53,7 +53,7 @@ EmptyPage {
             showNewScreenshotButton: false
             showOptionsMenu: false
             showUndoRedo: contextWindow.annotating
-            displayMode: QQC2.AbstractButton.TextBesideIcon
+            displayMode: QQC2.AbstractButton.IconOnly
         }
     }

Places

File 2000-toolbars.patch of Package spectacle (Revision 1022404d3c8f0064d8b0feb78bd982bd)

Places