Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.12] clean up some qml code for share dialog #6441

Merged
merged 4 commits into from
Feb 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/gui/filedetails/ShareDelegate.qml
Original file line number Diff line number Diff line change
@@ -262,8 +262,6 @@ GridLayout {
ShareDetailsPage {
id: shareDetailsPage

width: parent.width
height: parent.height
backgroundsVisible: root.backgroundsVisible
accentColor: root.accentColor

8 changes: 4 additions & 4 deletions src/gui/filedetails/ShareDetailsPage.qml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 2 additions & 4 deletions src/gui/filedetails/ShareeSearchField.qml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions src/gui/filedetails/sharemodel.cpp
Original file line number Diff line number Diff line change
@@ -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:
Loading