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.

Sign up for GitHub

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

Jump to bottom

fix: The size of the rounded corners in the small window folder is incorrect #248

Merged
merged 1 commit into from
May 6, 2024
Merged

fix: The size of the rounded corners in the small window folder is incorrect #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion qml/FolderGridViewPopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ Popup {
}
}
background: FloatingPanel {
radius: 36
radius: isWindowedMode ? 12 : 36
backgroundColor: Palette {
normal: Qt.rgba(1.0, 1.0, 1.0, 0.2)
normalDark: Qt.rgba(1.0, 1.0, 1.0, 0.2)
Expand Down
20 changes: 20 additions & 0 deletions qml/IconItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import QtQml.Models 2.15
import QtQuick.Controls 2.15
import org.deepin.dtk 1.0
import org.deepin.dtk.private 1.0
import org.deepin.dtk 1.0 as D
import org.deepin.dtk.style 1.0 as DS

import org.deepin.launchpad 1.0
import org.deepin.launchpad.models 1.0
Expand Down Expand Up @@ -166,6 +168,24 @@ Control {
button: parent
outsideBorderColor: null
radius: isWindowedMode ? 8 : 18
insideBorderColor: isWindowedMode ? null : DS.Style.button.insideBorder

property D.Palette background: D.Palette {
normal {
common: Qt.rgba(0, 0, 0, 0.1)
crystal: Qt.rgba(0, 0, 0, 0.1)
}
normalDark {
common: Qt.rgba(1, 1, 1, 0.1)
crystal: Qt.rgba(1, 1, 1, 0.1)
}
hovered {
common: Qt.rgba(16.0 / 255, 16.0 / 255, 16.0 / 255, 0.1)
crystal: Qt.rgba(16.0 / 255, 16.0 / 255, 16.0 / 255, 0.1)
}
}
color1: isWindowedMode ? background : DS.Style.button.background1
color2: isWindowedMode ? background : DS.Style.button.background2
}

TapHandler {
Expand Down
Loading