Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: 解决编译不通过的问题

Browse Source 
1、gerrit上打包提示DRegionMonitor重复定义导致编译不过，此处加上命名空间
2、删除不用的头文件包含

Log:
Influence: gerrit打包
Task: https://pms.uniontech.com/task-view-96831.html
Change-Id: Ic5f5c88619193a2b49482c967fff1eca5b784608
This commit is contained in:
donghualin 2023-01-11 09:09:36 +08:00
parent c3851717b5
commit 1175b75aa5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frame/window/quickpluginwindow.h
View File

@ -39,8 +39,7 @@ class QMenu;
class QuickPluginMimeData; class QuickPluginMimeData;
enum class DockPart; enum class DockPart;
namespace Dtk { namespace Gui { class DRegionMonitor; } namespace Dtk { namespace Widget { class DListView; class DStandardItem; } }
namespace Widget { class DListView; class DStandardItem; } }
using namespace Dtk::Widget; using namespace Dtk::Widget;

1
frame/window/tray/tray_gridview.cpp
View File

@ -406,6 +406,7 @@ bool TrayGridView::mouseInDock()
return mousePosition.x() > dockRect.left(); return mousePosition.x() > dockRect.left();
} }
} }
return false;
} }
void TrayGridView::handleDropEvent(QDropEvent *e) void TrayGridView::handleDropEvent(QDropEvent *e)

8
frame/window/tray/widgets/expandiconwidget.cpp
View File

@ -35,6 +35,8 @@
DGUI_USE_NAMESPACE DGUI_USE_NAMESPACE
using RegionMonitor = Dtk::Gui::DRegionMonitor;
ExpandIconWidget::ExpandIconWidget(QWidget *parent, Qt::WindowFlags f) ExpandIconWidget::ExpandIconWidget(QWidget *parent, Qt::WindowFlags f)
: BaseTrayWidget(parent, f) : BaseTrayWidget(parent, f)
, m_position(Dock::Position::Bottom) , m_position(Dock::Position::Bottom)
@ -192,7 +194,7 @@ TrayGridWidget::TrayGridWidget(QWidget *parent)
, m_dockInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this)) , m_dockInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this))
, m_trayGridView(nullptr) , m_trayGridView(nullptr)
, m_referGridView(nullptr) , m_referGridView(nullptr)
, m_regionInter(new DRegionMonitor(this)) , m_regionInter(new RegionMonitor(this))
{ {
initMember(); initMember();
setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_TranslucentBackground);
@ -281,14 +283,14 @@ void TrayGridWidget::hideEvent(QHideEvent *event)
void TrayGridWidget::initMember() void TrayGridWidget::initMember()
{ {
connect(m_regionInter, &DRegionMonitor::buttonPress, this, [ = ](const QPoint &mousePos, const int flag) { connect(m_regionInter, &RegionMonitor::buttonPress, this, [ = ](const QPoint &mousePos, const int flag) {
// 如果当前是隐藏，那么在点击任何地方都隐藏 // 如果当前是隐藏，那么在点击任何地方都隐藏
if (!isVisible()) { if (!isVisible()) {
hide(); hide();
return; return;
} }
if ((flag != DRegionMonitor::WatchedFlags::Button_Left) && (flag != DRegionMonitor::WatchedFlags::Button_Right)) if ((flag != RegionMonitor::WatchedFlags::Button_Left) && (flag != RegionMonitor::WatchedFlags::Button_Right))
return; return;
QPoint ptPos = parentWidget()->mapToGlobal(this->pos()); QPoint ptPos = parentWidget()->mapToGlobal(this->pos());

1
frame/window/traymanagerwindow.cpp
View File

@ -32,7 +32,6 @@
#include "utils.h" #include "utils.h"
#include <DGuiApplicationHelper> #include <DGuiApplicationHelper>
#include <DRegionMonitor>
#include <QDropEvent> #include <QDropEvent>
#include <QBoxLayout> #include <QBoxLayout>

3
frame/window/traymanagerwindow.h
View File

@ -28,8 +28,7 @@
#include <QWidget> #include <QWidget>
namespace Dtk { namespace Gui { class DRegionMonitor; }; namespace Dtk { namespace Widget { class DBlurEffectWidget; } }
namespace Widget { class DBlurEffectWidget; } }
using namespace Dtk::Widget; using namespace Dtk::Widget;