diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index e8281f03af..304563ef5a 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -131,7 +131,6 @@ Page { } function resetMenu() { - moreMenu.close(); resetNoteField(); resetPasswordField(); @@ -240,7 +239,7 @@ Page { clip: true ColumnLayout { - id: moreMenu + id: scrollContentsColumn readonly property int rowIconWidth: Style.smallIconSize readonly property int indicatorItemWidth: 20 @@ -252,12 +251,12 @@ Page { RowLayout { Layout.fillWidth: true height: visible ? implicitHeight : 0 - spacing: moreMenu.indicatorSpacing + spacing: scrollContentsColumn.indicatorSpacing visible: root.isLinkShare Image { - Layout.preferredWidth: moreMenu.indicatorItemWidth + Layout.preferredWidth: scrollContentsColumn.indicatorItemWidth Layout.fillHeight: true verticalAlignment: Image.AlignVCenter @@ -265,8 +264,8 @@ Page { fillMode: Image.Pad source: "image://svgimage-custom-color/edit.svg/" + palette.dark - sourceSize.width: moreMenu.rowIconWidth - sourceSize.height: moreMenu.rowIconWidth + sourceSize.width: scrollContentsColumn.rowIconWidth + sourceSize.height: scrollContentsColumn.rowIconWidth } NCInputTextField { @@ -323,10 +322,11 @@ Page { toolTipBase: Style.backgroundColor toolTipText: Style.ncTextColor } - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding - indicator.width: moreMenu.indicatorItemWidth - indicator.height: moreMenu.indicatorItemWidth + + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding + indicator.width: scrollContentsColumn.indicatorItemWidth + indicator.height: scrollContentsColumn.indicatorItemWidth checkable: true checked: root.editingAllowed @@ -364,10 +364,10 @@ Page { enabled: !root.isSharePermissionChangeInProgress checked: root.currentPermissionMode === permissionMode text: qsTr("View only") - indicatorItemWidth: moreMenu.indicatorItemWidth - indicatorItemHeight: moreMenu.indicatorItemWidth - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding + indicatorItemWidth: scrollContentsColumn.indicatorItemWidth + indicatorItemHeight: scrollContentsColumn.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding onClicked: root.permissionModeChanged(permissionMode) } @@ -378,10 +378,10 @@ Page { enabled: !root.isSharePermissionChangeInProgress checked: root.currentPermissionMode === permissionMode text: qsTr("Allow upload and editing") - indicatorItemWidth: moreMenu.indicatorItemWidth - indicatorItemHeight: moreMenu.indicatorItemWidth - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding + indicatorItemWidth: scrollContentsColumn.indicatorItemWidth + indicatorItemHeight: scrollContentsColumn.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding onClicked: root.permissionModeChanged(permissionMode) NCBusyIndicator { @@ -399,10 +399,10 @@ Page { enabled: !root.isSharePermissionChangeInProgress checked: root.currentPermissionMode === permissionMode text: qsTr("File drop (upload only)") - indicatorItemWidth: moreMenu.indicatorItemWidth - indicatorItemHeight: moreMenu.indicatorItemWidth - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding + indicatorItemWidth: scrollContentsColumn.indicatorItemWidth + indicatorItemHeight: scrollContentsColumn.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding onClicked: root.permissionModeChanged(permissionMode) } } @@ -444,10 +444,11 @@ Page { toolTipText: Style.ncTextColor } - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding - indicator.width: moreMenu.indicatorItemWidth - indicator.height: moreMenu.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding + indicator.width: scrollContentsColumn.indicatorItemWidth + indicator.height: scrollContentsColumn.indicatorItemWidth + checked: root.hideDownload text: qsTr("Hide download") enabled: !root.isHideDownloadInProgress @@ -492,10 +493,10 @@ Page { toolTipText: Style.ncTextColor } - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding - indicator.width: moreMenu.indicatorItemWidth - indicator.height: moreMenu.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding + indicator.width: scrollContentsColumn.indicatorItemWidth + indicator.height: scrollContentsColumn.indicatorItemWidth checkable: true checked: root.passwordProtectEnabled @@ -519,12 +520,12 @@ Page { Layout.fillWidth: true height: visible ? implicitHeight : 0 - spacing: moreMenu.indicatorSpacing + spacing: scrollContentsColumn.indicatorSpacing visible: root.passwordProtectEnabled Image { - Layout.preferredWidth: moreMenu.indicatorItemWidth + Layout.preferredWidth: scrollContentsColumn.indicatorItemWidth Layout.fillHeight: true verticalAlignment: Image.AlignVCenter @@ -532,8 +533,8 @@ Page { fillMode: Image.Pad source: "image://svgimage-custom-color/lock-https.svg/" + palette.dark - sourceSize.width: moreMenu.rowIconWidth - sourceSize.height: moreMenu.rowIconWidth + sourceSize.width: scrollContentsColumn.rowIconWidth + sourceSize.height: scrollContentsColumn.rowIconWidth } NCInputTextField { @@ -621,10 +622,10 @@ Page { toolTipText: Style.ncTextColor } - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding - indicator.width: moreMenu.indicatorItemWidth - indicator.height: moreMenu.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding + indicator.width: scrollContentsColumn.indicatorItemWidth + indicator.height: scrollContentsColumn.indicatorItemWidth checkable: true checked: root.expireDateEnabled @@ -647,12 +648,12 @@ Page { RowLayout { Layout.fillWidth: true height: visible ? implicitHeight : 0 - spacing: moreMenu.indicatorSpacing + spacing: scrollContentsColumn.indicatorSpacing visible: root.expireDateEnabled Image { - Layout.preferredWidth: moreMenu.indicatorItemWidth + Layout.preferredWidth: scrollContentsColumn.indicatorItemWidth Layout.fillHeight: true verticalAlignment: Image.AlignVCenter @@ -660,8 +661,8 @@ Page { fillMode: Image.Pad source: "image://svgimage-custom-color/calendar.svg/" + palette.dark - sourceSize.width: moreMenu.rowIconWidth - sourceSize.height: moreMenu.rowIconWidth + sourceSize.width: scrollContentsColumn.rowIconWidth + sourceSize.height: scrollContentsColumn.rowIconWidth } // QML dates are essentially JavaScript dates, which makes them very finicky and unreliable. @@ -749,7 +750,6 @@ Page { Layout.fillWidth: true height: visible ? implicitHeight : 0 - // We want all the internal benefits of the spinbox but don't actually want the // buttons, so set an empty item as a dummy up.indicator: Item {} @@ -836,10 +836,10 @@ Page { toolTipText: Style.ncTextColor } - spacing: moreMenu.indicatorSpacing - padding: moreMenu.itemPadding - indicator.width: moreMenu.indicatorItemWidth - indicator.height: moreMenu.indicatorItemWidth + spacing: scrollContentsColumn.indicatorSpacing + padding: scrollContentsColumn.itemPadding + indicator.width: scrollContentsColumn.indicatorItemWidth + indicator.height: scrollContentsColumn.indicatorItemWidth checkable: true checked: root.noteEnabled @@ -862,12 +862,12 @@ Page { RowLayout { Layout.fillWidth: true height: visible ? implicitHeight : 0 - spacing: moreMenu.indicatorSpacing + spacing: scrollContentsColumn.indicatorSpacing visible: root.noteEnabled Image { - Layout.preferredWidth: moreMenu.indicatorItemWidth + Layout.preferredWidth: scrollContentsColumn.indicatorItemWidth Layout.fillHeight: true verticalAlignment: Image.AlignVCenter @@ -875,8 +875,8 @@ Page { fillMode: Image.Pad source: "image://svgimage-custom-color/edit.svg/" + palette.dark - sourceSize.width: moreMenu.rowIconWidth - sourceSize.height: moreMenu.rowIconWidth + sourceSize.width: scrollContentsColumn.rowIconWidth + sourceSize.height: scrollContentsColumn.rowIconWidth } NCInputTextEdit {