comparison widgets/LevelPanToolButton.cpp @ 932:37bb4b416c52 tonioni

Render direct to widget (necessary to avoid pixel doubling on OS/X)

 
     connect(m_lpw, SIGNAL(levelChanged(float)), this, SIGNAL(levelChanged(float)));
     connect(m_lpw, SIGNAL(levelChanged(float)), this, SLOT(selfLevelChanged(float)));
 
     connect(m_lpw, SIGNAL(panChanged(float)), this, SIGNAL(panChanged(float)));
-    connect(m_lpw, SIGNAL(panChanged(float)), this, SLOT(redraw()));
+    connect(m_lpw, SIGNAL(panChanged(float)), this, SLOT(update()));
 
     connect(this, SIGNAL(clicked(bool)), this, SLOT(selfClicked()));
     
     QMenu *menu = new QMenu();
     QWidgetAction *wa = new QWidgetAction(menu);

     menu->addAction(wa);
 
     setPopupMode(MenuButtonPopup);
     setMenu(menu);
 
-    redraw();
+    setImageSize(m_pixels);
 }
 
 LevelPanToolButton::~LevelPanToolButton()
 {
 }

 
 void
 LevelPanToolButton::setImageSize(int pixels)
 {
     m_pixels = pixels;
-    redraw();
+
+    QPixmap px(m_pixels, m_pixels);
+    px.fill(Qt::transparent);
+    setIcon(px);
+
+    m_lpw->setFixedWidth(m_pixels * 4);
+    m_lpw->setFixedHeight(m_pixels * 4);
 }
 
 void
 LevelPanToolButton::setLevel(float level)
 {
     m_lpw->setLevel(level);
-    redraw();
+    update();
 }
 
 void
 LevelPanToolButton::setPan(float pan)
 {
     m_lpw->setPan(pan);
-    redraw();
+    update();
 }
 
 void
 LevelPanToolButton::selfLevelChanged(float level)
 {

 	m_muted = false;
     } else {
 	m_muted = true;
 	m_savedLevel = 1.f;
     }
-    redraw();
+    update();
 }
 
 void
 LevelPanToolButton::selfClicked()
 {

 	m_savedLevel = m_lpw->getLevel();
 	m_muted = true;
 	m_lpw->setLevel(0.f);
 	emit levelChanged(0.f);
     }
-    redraw();
+    update();
 }
 
 void
-LevelPanToolButton::redraw()
+LevelPanToolButton::paintEvent(QPaintEvent *e)
 {
-    QSize sz(m_pixels, m_pixels);
-
-    m_lpw->setFixedWidth(m_pixels * 4);
-    m_lpw->setFixedHeight(m_pixels * 4);
-    
-    QPixmap px(sz);
-    px.fill(Qt::transparent);
-    m_lpw->renderTo(&px, QRectF(QPointF(), sz), false);
-    setIcon(px);
+    QToolButton::paintEvent(e);
+    double margin = (double(height()) - m_pixels) / 2.0;
+    m_lpw->renderTo(this, QRectF(margin, margin, m_pixels, m_pixels), false);
 }
 
+