songwentao 04762453fa feat: 任务栏拖拽图标交互优化
单指长按应用图标超过1s后显示右键菜单,继续拖拽应用进行调整位置,拖拽的过程中右键菜单隐藏

Log: 优化任务栏拖拽图标人机交互逻辑
Influence: 优化任务栏拖拽图标与右键菜单显示的人机交互逻辑
Task: https://pms.uniontech.com/zentao/task-view-86283.html
Change-Id: I15b4e0cafeb94fc4545090e60965d217b93ab8cd
2021-11-01 17:43:32 +08:00

89 lines
2.5 KiB
C++

/*
* Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd.
*
* Author: rekols <rekols@foxmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DBUSADAPTORS_H
#define DBUSADAPTORS_H
#include "menudialog.h"
#include <QMenu>
#include <QtDBus/QtDBus>
#include <com_deepin_daemon_inputdevice_keyboard.h>
using Keyboard = com::deepin::daemon::inputdevice::Keyboard;
class QGSettings;
class DBusAdaptors : public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "com.deepin.dde.Keyboard")
// Q_CLASSINFO("D-Bus Introspection", ""
// " <interface name=\"com.deepin.dde.Keyboard\">\n"
// " <property access=\"read\" type=\"s\" name=\"layout\"/>\n"
// " <signal name=\"layoutChanged\">"
// " <arg name=\"layout\" type=\"s\"/>"
// " </signal>"
// " </interface>\n"
// "")
public:
explicit DBusAdaptors(QObject *parent = nullptr);
~DBusAdaptors();
public:
Q_PROPERTY(QString layout READ layout WRITE setLayout NOTIFY layoutChanged)
QString layout() const;
void setLayout(const QString &str);
Keyboard *getCurrentKeyboard();
public slots:
void onClicked(int button, int x, int y);
signals:
void layoutChanged(QString text);
private slots:
void onCurrentLayoutChanged(const QString & value);
void onUserLayoutListChanged(const QStringList & value);
void initAllLayoutList();
void refreshMenu();
void refreshMenuSelection();
void handleActionTriggered(QAction *action);
private slots:
void onGSettingsChanged(const QString &key);
private:
QString duplicateCheck(const QString &kb);
private:
Keyboard *m_keyboard;
Menu *m_menu;
QAction *m_addLayoutAction;
QString m_currentLayoutRaw;
QString m_currentLayout;
QStringList m_userLayoutList;
KeyboardLayoutList m_allLayoutList;
const QGSettings *m_gsettings;
};
#endif