Mercurial > hg > tony

changeset 440:14aa33dc2a54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Level-pan widget sizing for OS/X
author Chris Cannam
date Tue, 31 Mar 2015 14:46:40 +0100
parents 2a9ffc3ea1b0
children 692852208b6c
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Mar 31 14:38:19 2015 +0100
+++ b/.hgsubstate	Tue Mar 31 14:46:40 2015 +0100
@@ -4,4 +4,4 @@
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 c48bc6ddfe1762b63f1ea29475d59518fc13b281 svapp
 24c48323c662a3631ba004f4701a328cbf753893 svcore
-d6acb8e3660571ced8a0403095d210db7df2c3a4 svgui
+fcbfc7fad1f2bb3af17de67d546ecff16dbdeef4 svgui
--- a/src/MainWindow.cpp	Tue Mar 31 14:38:19 2015 +0100
+++ b/src/MainWindow.cpp	Tue Mar 31 14:46:40 2015 +0100
@@ -1158,7 +1158,17 @@
     connect(m_playAudio, SIGNAL(triggered()), this, SLOT(playAudioToggled()));
     connect(this, SIGNAL(canPlayWaveform(bool)), m_playAudio, SLOT(setEnabled(bool)));
 
-    m_audioLPW->setImageSize(m_viewManager->scalePixelSize(26));
+    int lpwSize, bigLpwSize;
+#ifdef Q_OS_MAC
+    lpwSize = m_viewManager->scalePixelSize(32); // Mac toolbars are fatter
+    bigLpwSize = lpwSize * 2.2;
+#else
+    lpwSize = m_viewManager->scalePixelSize(26);
+    bigLpwSize = lpwSize * 2.8;
+#endif
+    
+    m_audioLPW->setImageSize(lpwSize);
+    m_audioLPW->setBigImageSize(bigLpwSize);
     toolbar->addWidget(m_audioLPW);
 
     // Pitch (f0)
@@ -1177,7 +1187,8 @@
         connect(m_playPitch, SIGNAL(triggered()), this, SLOT(playPitchToggled()));
         connect(this, SIGNAL(canPlayPitch(bool)), m_playPitch, SLOT(setEnabled(bool)));
 
-        m_pitchLPW->setImageSize(m_viewManager->scalePixelSize(26));
+        m_pitchLPW->setImageSize(lpwSize);
+        m_pitchLPW->setBigImageSize(bigLpwSize);
         toolbar->addWidget(m_pitchLPW);
     } else {
         m_playPitch = 0;
@@ -1199,7 +1210,8 @@
         connect(m_playNotes, SIGNAL(triggered()), this, SLOT(playNotesToggled()));
         connect(this, SIGNAL(canPlayNotes(bool)), m_playNotes, SLOT(setEnabled(bool)));
 
-        m_notesLPW->setImageSize(m_viewManager->scalePixelSize(26));
+        m_notesLPW->setImageSize(lpwSize);
+        m_notesLPW->setBigImageSize(bigLpwSize);
         toolbar->addWidget(m_notesLPW);
     } else {
         m_playNotes = 0;