[Pkg-owncloud-commits] [owncloud-client] 70/120: Account Settings: Align the progressbar with the icon #3567

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 593016718defbcf1e86f192af9458e3963a9f233
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Aug 14 11:48:06 2015 +0200

    Account Settings: Align the progressbar with the icon #3567
---
 src/gui/folderstatusdelegate.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp
index 7d739b0..698a378 100644
--- a/src/gui/folderstatusdelegate.cpp
+++ b/src/gui/folderstatusdelegate.cpp
@@ -272,7 +272,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     if( !overallString.isEmpty() || !itemString.isEmpty()) {
         int fileNameTextHeight = subFm.boundingRect(tr("File")).height();
         int barHeight = qMax(fileNameTextHeight, aliasFm.height()+4); ;
-        int overallWidth = option.rect.width()-2*aliasMargin;
+        int overallWidth = option.rect.width()-aliasMargin-nextToIcon;
 
         painter->save();
 
@@ -283,7 +283,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         // Overall Progress Bar.
         QRect pBRect;
         pBRect.setTop( h );
-        pBRect.setLeft( iconRect.left());
+        pBRect.setLeft( nextToIcon );
         pBRect.setHeight(barHeight);
         pBRect.setWidth( overallWidth - progressTextWidth - margin );
 
@@ -312,7 +312,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
         // Individual File Progress
         QRect fileRect;
         fileRect.setTop( pBRect.bottom() + margin);
-        fileRect.setLeft( iconRect.left());
+        fileRect.setLeft(pBRect.left());
         fileRect.setWidth(overallWidth);
         fileRect.setHeight(fileNameTextHeight);
         QString elidedText = progressFm.elidedText(itemString, Qt::ElideLeft, fileRect.width());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git