Merge pull request #6425 from nextcloud/bugfix/setExpirationDateInter…

…nalShareLink clean up some qml code for share dialog
nextcloud · Feb 13, 2024 · 606b1ef · 606b1ef
2 parents 6797a57 + 4f2988a
commit 606b1ef
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/gui/filedetails/ShareDelegate.qml b/src/gui/filedetails/ShareDelegate.qml
@@ -262,8 +262,6 @@ GridLayout {
                 ShareDetailsPage {
                     id: shareDetailsPage
 
-                    width: parent.width
-                    height: parent.height
                     backgroundsVisible: root.backgroundsVisible
                     accentColor: root.accentColor
 

diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml
@@ -332,7 +332,7 @@ Page {
                         mid: Style.darkerHover
                         dark: Style.menuBorder
                         button: Style.buttonBackgroundColor
-                        window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+                        window: Style.menuBorder
                         base: Style.backgroundColor
                         toolTipBase: Style.backgroundColor
                         toolTipText: Style.ncTextColor
@@ -549,7 +549,7 @@ Page {
                     mid: Style.darkerHover
                     dark: Style.menuBorder
                     button: Style.buttonBackgroundColor
-                    window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+                    window: Style.menuBorder
                     base: Style.backgroundColor
                     toolTipBase: Style.backgroundColor
                     toolTipText: Style.ncTextColor
@@ -682,7 +682,7 @@ Page {
                     mid: Style.darkerHover
                     dark: Style.menuBorder
                     button: Style.buttonBackgroundColor
-                    window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+                    window: Style.menuBorder
                     base: Style.backgroundColor
                     toolTipBase: Style.backgroundColor
                     toolTipText: Style.ncTextColor
@@ -790,7 +790,7 @@ Page {
                     mid: Style.darkerHover
                     dark: Style.menuBorder
                     button: Style.buttonBackgroundColor
-                    window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
+                    window: Style.menuBorder
                     base: Style.backgroundColor
                     toolTipBase: Style.backgroundColor
                     toolTipText: Style.ncTextColor

diff --git a/src/gui/filedetails/ShareeSearchField.qml b/src/gui/filedetails/ShareeSearchField.qml
@@ -185,8 +185,7 @@ TextField {
                 interactive: true
 
                 highlight: Rectangle {
-                    width: shareeListView.currentItem.width
-                    height: shareeListView.currentItem.height
+                    anchors.fill: shareeListView.currentItem
                     color: palette.highlight
                 }
                 highlightFollowsCurrentItem: true
@@ -200,8 +199,7 @@ TextField {
 
                 model: root.shareeModel
                 delegate: ShareeDelegate {
-                    anchors.left: parent.left
-                    anchors.right: parent.right
+                    width: shareeListView.contentItem.width
 
                     enabled: model.type !== Sharee.LookupServerSearchResults
                     hoverEnabled: model.type !== Sharee.LookupServerSearchResults

diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp
@@ -189,6 +189,7 @@ QVariant ShareModel::data(const QModelIndex &index, const int role) const
     // Deal with roles that only return certain values for link or user/group share types
     case NoteEnabledRole:
     case ExpireDateEnabledRole:
+    case HideDownloadEnabledRole:
         return false;
     case LinkRole:
     case LinkShareNameRole: