[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets/pager
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2008-12-23 6:27:33
Message-ID: 1230013653.614187.5061.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 900526 by aseigo:
remove another deprecated "- 2" hack =)
patch by Manuel Mommertz
CCBUG:177871
M +6 -7 pager.cpp
--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #900525:900526
@@ -270,19 +270,18 @@
qreal ratio = (qreal)Kephal::ScreenUtils::desktopGeometry().width() / \
(qreal)Kephal::ScreenUtils::desktopGeometry().height();
if (formFactor() == Plasma::Vertical ) {
- //FIXME: extra 2px margin, as the panel margin calculation, as weird as \
that
- qreal optimalSize = (geometry().width() - KIconLoader::SizeSmall*ratio * \
columns + padding*(columns-1))/2 - 2; + qreal optimalSize = \
(geometry().width() - KIconLoader::SizeSmall*ratio * columns + padding*(columns-1)) / \
2;
if (optimalSize < leftMargin || optimalSize < rightMargin) {
- leftMargin = rightMargin = qMax(qreal(1), optimalSize);
+ leftMargin = rightMargin = qMax(qreal(0), optimalSize);
m_showOwnBackground = false;
}
} else if (formFactor() == Plasma::Horizontal ) {
- qreal optimalSize = (geometry().height() - KIconLoader::SizeSmall*rows + \
padding*(rows-1))/2 - 2; + qreal optimalSize = (geometry().height() - \
KIconLoader::SizeSmall*rows + padding*(rows-1)) / 2;
if (optimalSize < topMargin || optimalSize < bottomMargin) {
- topMargin = bottomMargin = qMax(qreal(1), optimalSize);
+ topMargin = bottomMargin = qMax(qreal(0), optimalSize);
m_showOwnBackground = false;
}
} else {
@@ -321,8 +320,8 @@
m_rects.clear();
m_animations.clear();
QRectF itemRect;
- itemRect.setWidth(floor(itemWidth - 1));
- itemRect.setHeight(floor(itemHeight - 1));
+ itemRect.setWidth(floor(itemWidth));
+ itemRect.setHeight(floor(itemHeight));
for (int i = 0; i < m_desktopCount; i++) {
itemRect.moveLeft(leftMargin + floor(i % columns * (itemWidth + padding)));
itemRect.moveTop(topMargin + floor(i / columns * (itemHeight + padding)));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic