From kde-commits  Mon Jan 12 20:59:19 2009
From: =?utf-8?q?Aaron=20J=2E=20Seigo?= <aseigo () kde ! org>
Date: Mon, 12 Jan 2009 20:59:19 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets/pager
Message-Id: <1231793959.521724.3715.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123179396716190

SVN commit 910229 by aseigo:

add the margins to the width/height; we do those margins, only in the mouse interaction we don't want them (re-)added
BUG:180440


 M  +2 -2      pager.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #910228:910229
@@ -268,12 +268,12 @@
     qreal itemWidth;
 
     if (formFactor() == Plasma::Vertical) {
-        itemWidth = (contentsRect().width() - padding * (columns - 1)) / columns;
+        itemWidth = (contentsRect().width() - leftMargin - rightMargin - padding * (columns - 1)) / columns;
         m_widthScaleFactor = itemWidth / Kephal::ScreenUtils::desktopGeometry().width();
         itemHeight = Kephal::ScreenUtils::desktopGeometry().height() * m_widthScaleFactor;
         m_heightScaleFactor = m_widthScaleFactor;
     } else {
-        itemHeight = (contentsRect().height() - padding * (rows - 1)) / rows;
+        itemHeight = (contentsRect().height() - topMargin - bottomMargin - padding * (rows - 1)) / rows;
         m_heightScaleFactor = itemHeight / Kephal::ScreenUtils::desktopGeometry().height();
         itemWidth = Kephal::ScreenUtils::desktopGeometry().width() * m_heightScaleFactor;
         if (m_displayedText == Name) {