alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce QWindow::setGeometry calls

Browse Source 
Don't call setPosition and resize, but do it all at once in a setGeometry
call. It simplifies the life of the QPA and WM, also it's quite faster as
we reduce the calls to the WM by half (both setPosition and resize are
syntax-sugar for setGeometry)

REVIEW: 116614
This commit is contained in:
Aleix Pol 2014-03-05 16:08:09 +01:00
parent da325d037b
commit 78c6e452df
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/shell/panelview.cpp
View File

@ -355,6 +355,7 @@ void PanelView::positionPanel()
} }
QScreen *s = screen(); QScreen *s = screen();
QPoint position;
switch (containment()->location()) { switch (containment()->location()) {
case Plasma::Types::TopEdge: case Plasma::Types::TopEdge:
@ -362,14 +363,14 @@ void PanelView::positionPanel()
switch (m_alignment) { switch (m_alignment) {
case Qt::AlignCenter: case Qt::AlignCenter:
setPosition(QPoint(s->geometry().center().x(), s->geometry().top()) + QPoint(m_offset - size().width()/2, m_distance)); position = QPoint(QPoint(s->geometry().center().x(), s->geometry().top()) + QPoint(m_offset - size().width()/2, m_distance));
break; break;
case Qt::AlignRight: case Qt::AlignRight:
setPosition(s->geometry().topRight() - QPoint(m_offset + size().width(), m_distance)); position = QPoint(s->geometry().topRight() - QPoint(m_offset + size().width(), m_distance));
break; break;
case Qt::AlignLeft: case Qt::AlignLeft:
default: default:
setPosition(s->geometry().topLeft() + QPoint(m_offset, m_distance)); position = QPoint(s->geometry().topLeft() + QPoint(m_offset, m_distance));
} }
break; break;
@ -378,14 +379,14 @@ void PanelView::positionPanel()
switch (m_alignment) { switch (m_alignment) {
case Qt::AlignCenter: case Qt::AlignCenter:
setPosition(QPoint(s->geometry().left(), s->geometry().center().y()) + QPoint(m_distance, m_offset)); position = QPoint(QPoint(s->geometry().left(), s->geometry().center().y()) + QPoint(m_distance, m_offset));
break; break;
case Qt::AlignRight: case Qt::AlignRight:
setPosition(s->geometry().bottomLeft() - QPoint(m_distance, m_offset + size().height())); position = QPoint(s->geometry().bottomLeft() - QPoint(m_distance, m_offset + size().height()));
break; break;
case Qt::AlignLeft: case Qt::AlignLeft:
default: default:
setPosition(s->geometry().topLeft() + QPoint(m_distance, m_offset)); position = QPoint(s->geometry().topLeft() + QPoint(m_distance, m_offset));
} }
break; break;
@ -394,14 +395,14 @@ void PanelView::positionPanel()
switch (m_alignment) { switch (m_alignment) {
case Qt::AlignCenter: case Qt::AlignCenter:
setPosition(QPoint(s->geometry().right(), s->geometry().center().y()) - QPoint(width() + m_distance, 0) + QPoint(0, m_offset - size().height()/2)); position = QPoint(QPoint(s->geometry().right(), s->geometry().center().y()) - QPoint(width() + m_distance, 0) + QPoint(0, m_offset - size().height()/2));
break; break;
case Qt::AlignRight: case Qt::AlignRight:
setPosition(s->geometry().bottomRight() - QPoint(width() + m_distance, 0) - QPoint(0, m_offset + size().height())); position = QPoint(s->geometry().bottomRight() - QPoint(width() + m_distance, 0) - QPoint(0, m_offset + size().height()));
break; break;
case Qt::AlignLeft: case Qt::AlignLeft:
default: default:
setPosition(s->geometry().topRight() - QPoint(width() + m_distance, 0) + QPoint(0, m_offset)); position = QPoint(s->geometry().topRight() - QPoint(width() + m_distance, 0) + QPoint(0, m_offset));
} }
break; break;
@ -411,14 +412,14 @@ void PanelView::positionPanel()
switch (m_alignment) { switch (m_alignment) {
case Qt::AlignCenter: case Qt::AlignCenter:
setPosition(QPoint(s->geometry().center().x(), s->geometry().bottom() - height() - m_distance) + QPoint(m_offset - size().width()/2, 1)); position = QPoint(QPoint(s->geometry().center().x(), s->geometry().bottom() - height() - m_distance) + QPoint(m_offset - size().width()/2, 1));
break; break;
case Qt::AlignRight: case Qt::AlignRight:
setPosition(s->geometry().bottomRight() - QPoint(0, height() + m_distance) - QPoint(m_offset + size().width(), 1)); position = QPoint(s->geometry().bottomRight() - QPoint(0, height() + m_distance) - QPoint(m_offset + size().width(), 1));
break; break;
case Qt::AlignLeft: case Qt::AlignLeft:
default: default:
setPosition(s->geometry().bottomLeft() - QPoint(0, height() + m_distance) + QPoint(m_offset, 1)); position = QPoint(s->geometry().bottomLeft() - QPoint(0, height() + m_distance) + QPoint(m_offset, 1));
} }
} }
m_strutsTimer->stop(); m_strutsTimer->stop();
@ -427,14 +428,14 @@ void PanelView::positionPanel()
setMaximumSize(screen()->size()); setMaximumSize(screen()->size());
if (formFactor() == Plasma::Types::Vertical) { if (formFactor() == Plasma::Types::Vertical) {
resize(thickness(), length()); setGeometry(QRect(position, QSize(thickness(), length())));
setMinimumSize(QSize(thickness(), m_minLength)); setMinimumSize(QSize(thickness(), m_minLength));
setMaximumSize(QSize(thickness(), m_maxLength)); setMaximumSize(QSize(thickness(), m_maxLength));
emit thicknessChanged(); emit thicknessChanged();
emit length(); emit length();
} else { } else {
resize(length(), thickness()); setGeometry(QRect(position, QSize(length(), thickness())));
setMinimumSize(QSize(m_minLength, thickness())); setMinimumSize(QSize(m_minLength, thickness()));
setMaximumSize(QSize(m_maxLength, thickness())); setMaximumSize(QSize(m_maxLength, thickness()));