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

add debug info

Browse Source 
Change-Id: Ie971d24c01ec3ba9aa196eccbd05edde259ae007
This commit is contained in:
石博文 2017-06-16 13:22:40 +08:00 committed by Deepin Code Review
parent b97d9d5ca7
commit 069b52093a
Notes: Deepin Code Review 2017-07-14 11:33:04 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Fri, 14 Jul 2017 11:33:01 +0800
Reviewed-on: https://cr.deepin.io/23877
Project: dde/dde-dock
Branch: refs/heads/master
4 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frame/util/docksettings.cpp
View File

@ -206,6 +206,8 @@ const QRect DockSettings::windowRect(const Position position, const bool hide) c
default:Q_UNREACHABLE();
}
qDebug() << Q_FUNC_INFO << m_mainWindowSize << primaryRect << p << size;
return QRect(primaryRect.topLeft() + p, size);
}
@ -280,6 +282,7 @@ void DockSettings::menuActionClicked(QAction *action)
void DockSettings::onPositionChanged()
{
qDebug() << Q_FUNC_INFO;
const Position prevPos = m_position;
const Position nextPos = Dock::Position(m_dockInter->position());
@ -299,6 +302,7 @@ void DockSettings::onPositionChanged()
void DockSettings::iconSizeChanged()
{
qDebug() << Q_FUNC_INFO;
m_iconSize = m_dockInter->iconSize();
AppItem::setIconBaseSize(m_iconSize);
@ -309,6 +313,7 @@ void DockSettings::iconSizeChanged()
void DockSettings::displayModeChanged()
{
qDebug() << Q_FUNC_INFO;
m_displayMode = Dock::DisplayMode(m_dockInter->displayMode());
DockItem::setDockDisplayMode(m_displayMode);
qApp->setProperty(PROP_DISPLAY_MODE, QVariant::fromValue(m_displayMode));
@ -320,6 +325,7 @@ void DockSettings::displayModeChanged()
void DockSettings::hideModeChanged()
{
qDebug() << Q_FUNC_INFO;
m_hideMode = Dock::HideMode(m_dockInter->hideMode());
emit windowHideModeChanged();
@ -327,6 +333,7 @@ void DockSettings::hideModeChanged()
void DockSettings::hideStateChanged()
{
qDebug() << Q_FUNC_INFO;
const Dock::HideState state = Dock::HideState(m_dockInter->hideState());
if (state == Dock::Unknown)
@ -339,6 +346,7 @@ void DockSettings::hideStateChanged()
void DockSettings::dockItemCountChanged()
{
qDebug() << Q_FUNC_INFO;
if (m_displayMode == Dock::Efficient)
return;
@ -349,6 +357,7 @@ void DockSettings::dockItemCountChanged()
void DockSettings::primaryScreenChanged()
{
qDebug() << Q_FUNC_INFO;
m_primaryRect = m_displayInter->primaryRect();
calculateWindowConfig();
@ -359,12 +368,14 @@ void DockSettings::primaryScreenChanged()
void DockSettings::resetFrontendGeometry()
{
const QRect r = windowRect(m_position);
qDebug() << Q_FUNC_INFO << r;
m_dockInter->SetFrontendWindowRect(r.x(), r.y(), r.width(), r.height());
}
void DockSettings::calculateWindowConfig()
{
qDebug() << Q_FUNC_INFO;
const int defaultHeight = AppItem::itemBaseHeight();
const int defaultWidth = AppItem::itemBaseWidth();

30
frame/window/mainwindow.cpp
View File

@ -124,18 +124,22 @@ void MainWindow::setFixedSize(const QSize &size)
{
const QPropertyAnimation::State state = m_sizeChangeAni->state();
qDebug() << state;
if (state == QPropertyAnimation::Stopped && this->size() == size)
return;
if (state == QPropertyAnimation::Running)
return m_sizeChangeAni->setEndValue(size);
qDebug() << Q_FUNC_INFO << size;
m_sizeChangeAni->setStartValue(this->size());
m_sizeChangeAni->setEndValue(size);
m_sizeChangeAni->start();
}
void MainWindow::move(int x, int y)
void MainWindow::internalMove(int x, int y)
{
const QPropertyAnimation::State state = m_posChangeAni->state();
const QPoint p = pos();
@ -144,8 +148,8 @@ void MainWindow::move(int x, int y)
if (state == QPropertyAnimation::Stopped && p == tp)
return;
if (state == QPropertyAnimation::Running && m_posChangeAni->endValue() != tp)
return m_posChangeAni->setEndValue(QPoint(x, y));
// if (state == QPropertyAnimation::Running && m_posChangeAni->endValue() != tp)
// return m_posChangeAni->setEndValue(QPoint(x, y));
m_posChangeAni->setStartValue(p);
m_posChangeAni->setEndValue(tp);
@ -171,6 +175,8 @@ void MainWindow::initComponents()
void MainWindow::compositeChanged()
{
qDebug() << Q_FUNC_INFO;
const int duration = m_wmHelper->hasComposite() ? 200 : 0;
m_sizeChangeAni->setDuration(duration);
@ -199,7 +205,7 @@ void MainWindow::initConnections()
connect(m_panelHideAni, &QPropertyAnimation::finished, this, &MainWindow::updateGeometry, Qt::QueuedConnection);
// to fix qt animation bug, sometimes window size not change
// // to fix qt animation bug, sometimes window size not change
connect(m_sizeChangeAni, &QPropertyAnimation::valueChanged, [this] {
const QSize size = m_sizeChangeAni->currentValue().toSize();
@ -272,6 +278,7 @@ void MainWindow::positionChanged(const Position prevPos)
void MainWindow::updatePosition()
{
qDebug() << Q_FUNC_INFO;
// all update operation need pass by timer
Q_ASSERT(sender() == m_positionUpdateTimer);
@ -288,6 +295,8 @@ void MainWindow::updateGeometry()
const Position position = m_settings->position();
QSize size = m_settings->windowSize();
qDebug() << Q_FUNC_INFO << position << size;
m_mainPanel->setFixedSize(size);
m_mainPanel->updateDockPosition(position);
m_mainPanel->updateDockDisplayMode(m_settings->displayMode());
@ -328,7 +337,7 @@ void MainWindow::updateGeometry()
// Q_ASSERT(false);
// }
const QRect windowRect = m_settings->windowRect(position, m_settings->hideState() == Hide);
move(windowRect.x(), windowRect.y());
internalMove(windowRect.x(), windowRect.y());
m_mainPanel->update();
}
@ -339,6 +348,7 @@ void MainWindow::clearStrutPartial()
void MainWindow::setStrutPartial()
{
qDebug() << Q_FUNC_INFO;
// first, clear old strut partial
clearStrutPartial();
@ -420,7 +430,7 @@ void MainWindow::setStrutPartial()
void MainWindow::expand()
{
// qDebug() << "expand";
qDebug() << "expand";
const QPoint finishPos(0, 0);
if (m_mainPanel->pos() == finishPos && m_mainPanel->size() == this->size() && m_panelHideAni->state() == QPropertyAnimation::Stopped)
@ -450,7 +460,7 @@ void MainWindow::expand()
void MainWindow::narrow(const Position prevPos)
{
// qDebug() << "narrow";
qDebug() << "narrow" << prevPos;
// const QSize size = m_settings->windowSize();
const QSize size = m_mainPanel->size();
@ -484,6 +494,7 @@ void MainWindow::resetPanelEnvironment(const bool visible)
const Position position = m_settings->position();
const QRect r(m_settings->windowRect(position));
qDebug() << Q_FUNC_INFO << r;
m_sizeChangeAni->setEndValue(r.size());
m_mainPanel->setFixedSize(r.size());
QWidget::setFixedSize(r.size());
@ -508,7 +519,7 @@ void MainWindow::resetPanelEnvironment(const bool visible)
void MainWindow::updatePanelVisible()
{
// qDebug() << m_updatePanelVisible;
qDebug() << m_updatePanelVisible;
if (!m_updatePanelVisible)
return;
@ -517,7 +528,7 @@ void MainWindow::updatePanelVisible()
const Dock::HideState state = m_settings->hideState();
// qDebug() << state;
qDebug() << state;
do
{
@ -540,6 +551,7 @@ void MainWindow::updatePanelVisible()
void MainWindow::adjustShadowMask()
{
qDebug() << Q_FUNC_INFO << m_mainPanel->pos() << m_panelHideAni->state() << m_panelShowAni->state() << m_wmHelper->hasComposite();
if (m_mainPanel->pos() != QPoint(0, 0) ||
m_panelHideAni->state() == QPropertyAnimation::Running ||
m_panelShowAni->state() == QPauseAnimation::Running ||

2
frame/window/mainwindow.h
View File

@ -33,7 +33,7 @@ private:
void dragEnterEvent(QDragEnterEvent *e);
void setFixedSize(const QSize &size);
void move(int x, int y);
void internalMove(int x, int y);
void initComponents();
void initConnections();

10
frame/xcb/xcb_misc.cpp
View File

@ -93,11 +93,11 @@ void XcbMisc::set_strut_partial(xcb_window_t winId, Orientation orientation, uin
break;
}
// qDebug() << "xcb_ewmh_set_wm_strut_partial" << endl
// << "top" << strut_partial.top << strut_partial.top_start_x << strut_partial.top_end_x << endl
// << "left" << strut_partial.left << strut_partial.left_start_y << strut_partial.left_end_y << endl
// << "right" << strut_partial.right << strut_partial.right_start_y << strut_partial.right_end_y << endl
// << "bottom" << strut_partial.bottom << strut_partial.bottom_start_x << strut_partial.bottom_end_x << endl;
qDebug() << "xcb_ewmh_set_wm_strut_partial" << endl
<< "top" << strut_partial.top << strut_partial.top_start_x << strut_partial.top_end_x << endl
<< "left" << strut_partial.left << strut_partial.left_start_y << strut_partial.left_end_y << endl
<< "right" << strut_partial.right << strut_partial.right_start_y << strut_partial.right_end_y << endl
<< "bottom" << strut_partial.bottom << strut_partial.bottom_start_x << strut_partial.bottom_end_x << endl;
xcb_ewmh_set_wm_strut_partial(&m_ewmh_connection, winId, strut_partial);
}