Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 只有预览应用时界面圆角为18其他tips圆角为6 (#709)

Browse Source 
只有预览应用时界面圆角为18其他tips圆角为6, 并且tips高度根据内容计算高度再加4像素

Log: 修复任务栏应用tips框样式问题
Bug: https://pms.uniontech.com/bug-view-166289.html
Influence: 任务栏tips正常显示
This commit is contained in:
chenjun 2022-10-25 11:16:56 +06:00 committed by GitHub
parent 968140e6e2
commit 81e6eb87d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/DdeDock/DdeDockConfig.cmake Normal file
View File

@ -0,0 +1,2 @@
set(DDE_DOCK_INCLUDE_DIR /usr/local/include/dde-dock)
include_directories("${DDE_DOCK_INCLUDE_DIR}")

2
frame/item/appitem.cpp
View File

@ -603,7 +603,7 @@ void AppItem::showPreview()
PopupWindow->setLeftRightRadius(false);
}
showPopupWindow(m_appPreviewTips, true);
showPopupWindow(m_appPreviewTips, true, 18);
}
void AppItem::playSwingEffect()

1
frame/item/components/appdragwidget.cpp
View File

@ -34,7 +34,6 @@ AppDragWidget::AppDragWidget(QWidget *parent)
m_popupWindow->setShadowXOffset(0);
m_popupWindow->setArrowWidth(18);
m_popupWindow->setArrowHeight(10);
m_popupWindow->setRadius(18);
m_scene->addItem(m_object.get());
setScene(m_scene);

10
frame/item/dockitem.cpp
View File

@ -30,7 +30,7 @@ DockItem::DockItem(QWidget *parent)
if (PopupWindow.isNull()) {
DockPopupWindow *arrowRectangle = new DockPopupWindow(nullptr);
arrowRectangle->setShadowBlurRadius(20);
arrowRectangle->setRadius(18);
arrowRectangle->setRadius(6);
arrowRectangle->setShadowYOffset(2);
arrowRectangle->setShadowXOffset(0);
arrowRectangle->setArrowWidth(18);
@ -270,13 +270,9 @@ void DockItem::showHoverTips()
showPopupWindow(content);
}
void DockItem::showPopupWindow(QWidget *const content, const bool model)
void DockItem::showPopupWindow(QWidget *const content, const bool model, const int radius)
{
if(itemType() == App){
PopupWindow->setRadius(18);
}else {
PopupWindow->setRadius(6);
}
PopupWindow->setRadius(radius);
m_popupShown = true;
m_lastPopupWidget = content;

2
frame/item/dockitem.h
View File

@ -72,7 +72,7 @@ protected:
void hideNonModel();
void popupWindowAccept();
virtual void showPopupWindow(QWidget *const content, const bool model = false);
virtual void showPopupWindow(QWidget *const content, const bool model = false, const int radius = 6);
virtual void showHoverTips();
virtual void invokedMenuItem(const QString &itemId, const bool checked);
virtual const QString contextMenu() const;

4
frame/item/pluginsitem.cpp
View File

@ -242,9 +242,9 @@ void PluginsItem::invokedMenuItem(const QString &itemId, const bool checked)
m_pluginInter->invokedMenuItem(m_itemKey, itemId, checked);
}
void PluginsItem::showPopupWindow(QWidget *const content, const bool model)
void PluginsItem::showPopupWindow(QWidget *const content, const bool model, const int radius)
{
DockItem::showPopupWindow(content, model);
DockItem::showPopupWindow(content, model, radius);
}
const QString PluginsItem::contextMenu() const

2
frame/item/pluginsitem.h
View File

@ -50,7 +50,7 @@ protected:
void showEvent(QShowEvent *event) override;
void invokedMenuItem(const QString &itemId, const bool checked) override;
void showPopupWindow(QWidget *const content, const bool model = false) override;
void showPopupWindow(QWidget *const content, const bool model = false, const int radius = 6) override;
const QString contextMenu() const override;
QWidget *popupTips() override;
void resizeEvent(QResizeEvent *event) override;

6
widgets/tipswidget.cpp
View File

@ -8,6 +8,8 @@
#include <QAccessible>
#include <QTextDocument>
#define PADDING 4
namespace Dock{
TipsWidget::TipsWidget(QWidget *parent)
: QFrame(parent)
@ -30,7 +32,7 @@ void TipsWidget::setText(const QString &text)
m_text = "བོད་སྐད་ཡིག་གཟུགས་ཚད་ལེན་ཚོད་ལྟའི་སྐོར་གྱི་རྗོད་ཚིག";
#endif
setFixedSize(fontMetrics().width(m_text) + 20, fontMetrics().boundingRect(m_text).height());
setFixedSize(fontMetrics().width(m_text) + 20, fontMetrics().boundingRect(m_text).height() + PADDING);
update();
@ -54,7 +56,7 @@ void TipsWidget::setTextList(const QStringList &textList)
height += fontMetrics().boundingRect(text).height();
}
setFixedSize(width + 20, height);
setFixedSize(width + 20, height + PADDING);
update();
}