Improve tracker list look (torrent properties dialog), support RTL layout

diff --git a/qt/details.ui b/qt/details.ui
index ebc572c7e0dde6d83c8717e6e35be3be4b4f7ee2..9c0f0ecc67059cee4579355a831951e947b3b0d8 100644 (file)
--- a/qt/details.ui
+++ b/qt/details.ui
@@ -524,6 +524,9 @@
       <layout class="QGridLayout" name="trackersTabLayout">
        <item row="0" column="0" rowspan="4">
         <widget class="QListView" name="trackersView">
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>

diff --git a/qt/favicon.cc b/qt/favicon.cc
index 735867b9fc3cd65ab385c41d52a3fb955e909b6a..3077a101271bb68f8865e5a31dbe5666ffa58473 100644 (file)
--- a/qt/favicon.cc
+++ b/qt/favicon.cc
@@ -88,23 +88,25 @@ Favicons::getHost (const QUrl& url)
   return host;
 }
 
+QSize
+Favicons::getIconSize ()
+{
+  return QSize (16, 16);
+}
+
 QPixmap
 Favicons::find (const QUrl& url)
 {
   return findFromHost (getHost (url));
 }
 
-namespace
-{
-  const QSize rightSize (16, 16);
-};
-
 QPixmap
 Favicons::findFromHost (const QString& host)
 {
   ensureCacheDirHasBeenScanned ();
 
   const QPixmap pixmap = myPixmaps[host];
+  const QSize rightSize = getIconSize ();
   return pixmap.isNull () || pixmap.size () == rightSize ? pixmap : pixmap.scaled (rightSize);
 }
 

diff --git a/qt/favicon.h b/qt/favicon.h
index c18fe38054c914a4b65fc03aeda8532f7cf8d01a..585c2fe588c702f6d9c82acb58b86c34fb4bd77a 100644 (file)
--- a/qt/favicon.h
+++ b/qt/favicon.h
@@ -26,6 +26,7 @@ class Favicons: public QObject
   public:
 
     static QString getHost( const QUrl& url );
+    static QSize getIconSize ();
 
   public:
 

diff --git a/qt/tracker-delegate.cc b/qt/tracker-delegate.cc
index 43d1fb860d4989015bbaa37e495be797dcc249e4..2d0648c28a6edcac91931cd963d40bf2723cdcd0 100644 (file)
--- a/qt/tracker-delegate.cc
+++ b/qt/tracker-delegate.cc
@@ -9,6 +9,8 @@
 
 #include <iostream>
 
+#include <QAbstractTextDocumentLayout>
+#include <QApplication>
 #include <QPainter>
 #include <QPixmap>
 #include <QTextDocument>
@@ -21,6 +23,7 @@
 #include "torrent.h"
 #include "tracker-delegate.h"
 #include "tracker-model.h"
+#include "utils.h"
 
 /***
 ****
@@ -29,7 +32,55 @@
 namespace
 {
   const int mySpacing = 6;
-  const QSize myMargin (10, 6);
+  const QSize myMargin (10, 10);
+
+  class ItemLayout
+  {
+    private:
+      QTextDocument myTextDocument;
+
+    public:
+      QRect iconRect;
+      QRect textRect;
+
+    public:
+      ItemLayout(const QString& text, bool suppressColors, Qt::LayoutDirection direction,
+                 const QPoint& topLeft, int width);
+
+      QSize size () const
+      {
+        return (iconRect | textRect).size ();
+      }
+
+      QAbstractTextDocumentLayout * textLayout () const
+      {
+        return myTextDocument.documentLayout ();
+      }
+  };
+
+  ItemLayout::ItemLayout(const QString& text, bool suppressColors, Qt::LayoutDirection direction,
+                         const QPoint& topLeft, int width)
+  {
+    const QStyle * style (qApp->style ());
+    const QSize iconSize = Favicons::getIconSize ();
+
+    QRect baseRect (topLeft, QSize (width, 0));
+
+    iconRect = style->alignedRect (direction, Qt::AlignLeft | Qt::AlignTop, iconSize, baseRect);
+    Utils::narrowRect (baseRect, iconSize.width () + mySpacing, 0, direction);
+
+    myTextDocument.setDocumentMargin (0);
+    myTextDocument.setTextWidth (baseRect.width ());
+    QTextOption textOption;
+    textOption.setTextDirection (direction);
+    if (suppressColors)
+      textOption.setFlags (QTextOption::SuppressColors);
+    myTextDocument.setDefaultTextOption (textOption);
+    myTextDocument.setHtml (text);
+
+    textRect = baseRect;
+    textRect.setSize (myTextDocument.size ().toSize ());
+  }
 }
 
 QSize
@@ -48,17 +99,8 @@ QSize
 TrackerDelegate::sizeHint (const QStyleOptionViewItem & option,
                            const TrackerInfo          & info) const
 {
-  Q_UNUSED (option);
-
-  QPixmap favicon = info.st.getFavicon ();
-
-  const QString text = TrackerDelegate::getText(info);
-  QTextDocument textDoc;
-  textDoc.setHtml (text);
-  const QSize textSize = textDoc.size().toSize();
-
-  return QSize (myMargin.width() + favicon.width() + mySpacing + textSize.width() + myMargin.width(),
-                myMargin.height() + qMax<int> (favicon.height(), textSize.height()) + myMargin.height());
+  const ItemLayout layout (getText (info), true, option.direction, QPoint (0, 0), option.rect.width () - myMargin.width () * 2);
+  return layout.size () + myMargin * 2;
 }
 
 QSize
@@ -88,23 +130,22 @@ TrackerDelegate::drawTracker (QPainter                    * painter,
                               const QStyleOptionViewItem  & option,
                               const TrackerInfo           & inf) const
 {
+  const bool isItemSelected ((option.state & QStyle::State_Selected) != 0);
+
+  QIcon trackerIcon (inf.st.getFavicon());
+
+  const QRect contentRect (option.rect.adjusted (myMargin.width (), myMargin.height (), -myMargin.width (), -myMargin.height ()));
+  const ItemLayout layout (getText (inf), isItemSelected, option.direction, contentRect.topLeft (), contentRect.width ());
+
   painter->save();
 
-  QPixmap icon = inf.st.getFavicon();
-  QRect iconArea (option.rect.x() + myMargin.width(),
-                  option.rect.y() + myMargin.height(),
-                  icon.width(),
-                  icon.height());
-  painter->drawPixmap (iconArea.x(), iconArea.y()+4, icon);
-
-  const int textWidth = option.rect.width() - myMargin.width()*2 - mySpacing - icon.width();
-  const int textX = myMargin.width() + icon.width() + mySpacing;
-  const QString text = getText (inf);
-  QTextDocument textDoc;
-  textDoc.setHtml (text);
-  const QRect textRect (textX, iconArea.y(), textWidth, option.rect.height() - myMargin.height()*2);
-  painter->translate (textRect.topLeft());
-  textDoc.drawContents (painter, textRect.translated (-textRect.topLeft()));
+  trackerIcon.paint (painter, layout.iconRect, Qt::AlignCenter, isItemSelected ? QIcon::Selected : QIcon::Normal, QIcon::On);
+
+  QAbstractTextDocumentLayout::PaintContext paintContext;
+  paintContext.clip = layout.textRect.translated (-layout.textRect.topLeft ());
+  paintContext.palette.setColor (QPalette::Text, option.palette.color (isItemSelected ? QPalette::HighlightedText : QPalette::Text));
+  painter->translate (layout.textRect.topLeft());
+  layout.textLayout ()->draw (painter, paintContext);
 
   painter->restore();
 }