Changeset 14547

Timestamp:

Jun 28, 2015, 2:18:06 PM (7 years ago)

Author:

mikedld

Message:

Some look-and-feel improvements for Mac and GTK+ styles (Qt client)

Location:

trunk/qt

Files:

• IconToolButton.cc (modified) (3 diffs)
• IconToolButton.h (modified) (1 diff)
• MainWindow.cc (modified) (1 diff)
• MainWindow.ui (modified) (3 diffs)
• TorrentDelegateMin.cc (modified) (1 diff)

trunk/qt/IconToolButton.cc

@@ -8 +8 @@
  */
 
+#include <QStyle>
 #include <QStyleOption>
 #include <QStyleOptionToolButton>
@@ -19 +20 @@
 }
 
+QSize
+IconToolButton::sizeHint () const
+{
+  QStyleOptionToolButton option;
+  initStyleOption (&option);
+  option.features = QStyleOptionToolButton::None;
+  option.toolButtonStyle = Qt::ToolButtonIconOnly;
+  const QSize size = style ()->sizeFromContents (QStyle::CT_ToolButton, &option, iconSize (), this);
+
+  return size.expandedTo (iconSize () + QSize (8, 8));
+}
+
 void IconToolButton::paintEvent (QPaintEvent * /*event*/)
 {
@@ -24 +37 @@
   QStyleOptionToolButton option;
   initStyleOption (&option);
-  option.features &= ~QStyleOptionToolButton::HasMenu;
+  option.features = QStyleOptionToolButton::None;
+  option.toolButtonStyle = Qt::ToolButtonIconOnly;
   painter.drawComplexControl(QStyle::CC_ToolButton, option);
 }

trunk/qt/IconToolButton.h

@@ -20 +20 @@
     IconToolButton (QWidget * parent = nullptr);
 
+    // QWidget
+    virtual QSize sizeHint () const;
+
   protected:
     // QWidget

trunk/qt/MainWindow.cc

@@ -112 +112 @@
 
   ui.listView->setStyle (new ListViewProxyStyle);
+  ui.listView->setAttribute (Qt::WA_MacShowFocusRect, false);
 
   // icons

trunk/qt/MainWindow.ui

@@ -68 +68 @@
            <normaloff>:/icons/utilities.png</normaloff>:/icons/utilities.png</iconset>
          </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
          <property name="popupMode">
           <enum>QToolButton::InstantPopup</enum>
@@ -80 +86 @@
        </item>
        <item>
-        <widget class="QToolButton" name="altSpeedButton">
+        <widget class="IconToolButton" name="altSpeedButton">
          <property name="icon">
           <iconset resource="application.qrc">
            <normaloff>:/icons/alt-limit-off.png</normaloff>
            <normalon>:/icons/alt-limit-on.png</normalon>:/icons/alt-limit-off.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
          </property>
          <property name="checkable">
@@ -135 +147 @@
           <iconset resource="application.qrc">
            <normaloff>:/icons/ratio.png</normaloff>:/icons/ratio.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
          </property>
          <property name="popupMode">

trunk/qt/TorrentDelegateMin.cc

@@ -33 +33 @@
   GUI_PAD = 6,
   BAR_WIDTH = 50,
-  BAR_HEIGHT = 12,
+  BAR_HEIGHT = 16,
   LINE_SPACING = 4
 };