A little code clean-up, and clarification.

zealdocs · Dec 21, 2013 · efcd461 · efcd461
1 parent fdc9c59
commit efcd461
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/zeal/progressitemdelegate.cpp b/zeal/progressitemdelegate.cpp
@@ -10,32 +10,37 @@ ProgressItemDelegate::ProgressItemDelegate(QObject *parent) :
 
 void ProgressItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
+    QStyleOptionViewItem tempOption = option;
     QVariant itemProgress = index.model()->data(index, ProgressRole);
     QVariant maxProgress  = index.model()->data(index, ProgressMaxRole);
-    QVariant formatProgress = index.model()->data(index, ProgressFormatRole);
     QVariant visible = index.model()->data(index, ProgressVisibleRole);
-    QStyleOptionViewItem tempOption = option;
-    if( itemProgress.isValid() && maxProgress.isValid() && (visible.isValid() && visible.toBool()) ){
-        tempOption.rect.setRight( tempOption.rect.right() - 150 );
 
+    if( itemProgress.isValid() && maxProgress.isValid() && (visible.isValid() && visible.toBool()) ){
         QProgressBar renderer;
+        QVariant formatProgress = index.model()->data(index, ProgressFormatRole);
         int progressAmnt = itemProgress.toInt();
 
-        renderer.resize( QSize( 150, tempOption.rect.height() ));
+        // Adjust maximum text width
+        tempOption.rect.setRight( tempOption.rect.right() - progressBarWidth);
+
+        // Size progress bar
+        renderer.resize( QSize( progressBarWidth, tempOption.rect.height() ));
         renderer.setMinimum(0);
         renderer.setMaximum( maxProgress.toInt() );
         renderer.setValue( progressAmnt );
         if( formatProgress.isValid() ){
             renderer.setFormat( formatProgress.toString() );
         }
 
+        // Paint progress bar
         painter->save();
         QPoint rect = tempOption.rect.topRight();
         painter->translate( rect );
         renderer.render( painter );
         painter->restore();
     }
 
+    // Paint text
     QItemDelegate::paint( painter, dynamic_cast<const QStyleOptionViewItem&>(tempOption), index );
 
     return;

diff --git a/zeal/progressitemdelegate.h b/zeal/progressitemdelegate.h
@@ -18,6 +18,8 @@ class ProgressItemDelegate : public QItemDelegate
         ProgressFormatRole = Qt::UserRole + 12,
         ProgressVisibleRole = Qt::UserRole + 13
     };
+private:
+    static const int progressBarWidth = 150;
 
 signals: