openkylin
/
ukui-menu
mirror of https://gitee.com/openkylin/ukui-menu.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge tag 'upstream/4.10.2.2' into packaging/openkylin/nile 

4.10.2.2-release
This commit is contained in:
hewenfei 2024-06-01 10:28:40 +08:00
parent 5a25e2feeb 09bcddf500
commit c8a45661fb
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qml/AppUI/Sidebar.qml
View File

@ -37,6 +37,8 @@ Item {
UkuiItems.Button {
id: fullScreenButton
visible: !isLiteMode
background.paletteRole: Platform.Theme.WindowText
background.alpha: containsPress ? 0.15 : containsMouse ? 0.08 : 0.0
Layout.preferredWidth: 36
Layout.preferredHeight: 36
@ -82,6 +84,8 @@ Item {
UkuiItems.Button {
id: userInfoButton
background.paletteRole: Platform.Theme.WindowText
background.alpha: containsPress ? 0.15 : containsMouse ? 0.08 : 0.0
Layout.preferredWidth: 36
Layout.preferredHeight: 36
@ -110,6 +114,8 @@ Item {
UkuiItems.Button {
id: computerButton
background.paletteRole: Platform.Theme.WindowText
background.alpha: containsPress ? 0.15 : containsMouse ? 0.08 : 0.0
Layout.preferredWidth: 36
Layout.preferredHeight: 36
@ -138,6 +144,8 @@ Item {
UkuiItems.Button {
id: setButton
background.paletteRole: Platform.Theme.WindowText
background.alpha: containsPress ? 0.15 : containsMouse ? 0.08 : 0.0
Layout.preferredWidth: 36
Layout.preferredHeight: 36
@ -167,6 +175,9 @@ Item {
UkuiItems.Button {
id: powerButton
background.paletteRole: Platform.Theme.WindowText
background.alpha: containsPress ? 0.15 : containsMouse ? 0.08 : 0.0
Layout.preferredWidth: 36
Layout.preferredHeight: 36
Layout.alignment: Qt.AlignHCenter

BIN
res/icon/default-community-image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

1
res/res.qrc
View File

@ -2,5 +2,6 @@
<qresource prefix="/res">
<file>icon/application-x-desktop.png</file>
<file>icon/pad_mainpower.svg</file>
<file>icon/default-community-image.png</file>
</qresource>
</RCC>

2
src/utils/sidebar-button-utils.cpp
View File

@ -52,7 +52,7 @@ QString SidebarButtonUtils::getRealName()
QString SidebarButtonUtils::getIconFile()
{
if (m_currentUserInfo.iconFile.isEmpty()) {
if (m_currentUserInfo.iconFile.isEmpty() || m_currentUserInfo.iconFile.endsWith("/.face")) {
return {DEFAULT_USER_ICON_FILE};
}