Just some benign tests to try to solve too-tall toolbar

3 files changed, 19 insertions, 16 deletions

diff --git a/muse2/muse/widgets/lcombo.cpp b/muse2/muse/widgets/lcombo.cpp
index 06041df4..a8e9d687 100644
--- a/muse2/muse/widgets/lcombo.cpp
+++ b/muse2/muse/widgets/lcombo.cpp
@@ -35,19 +35,19 @@ LabelCombo::LabelCombo(const QString& txt, QWidget* parent,
    const char* name) : QWidget(parent)
       {
       setObjectName(name);
-//      setFixedHeight(20);
       QHBoxLayout* layout = new QHBoxLayout(this);
       QLabel* label = new QLabel(txt, this);
-      //box = new QComboBox(false, this);
+      //label->setContentsMargins(0,0,0,0);                                               // REMOVE Tim. Or keep.
       box = new QComboBox(this);
+      //box->setContentsMargins(0,0,0,0);                                                 //
+      // Ignored was only solution, others were too tall. The label takes priority then.  //
+      //box->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);                 //
       box->setEditable(false);
-      ///layout->addStretch();
       layout->addSpacing(5);
       layout->addWidget(label);
       layout->addSpacing(5);
       layout->addWidget(box);
       layout->addSpacing(5);
-      ///layout->addStretch();
       connect(box, SIGNAL(activated(int)), SIGNAL(activated(int)));
       }
 
diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp
index a706a313..c6c7ddfe 100644
--- a/muse2/muse/widgets/poslabel.cpp
+++ b/muse2/muse/widgets/poslabel.cpp
@@ -53,9 +53,12 @@ PosLabel::PosLabel(QWidget* parent, const char* name)
       setFrameStyle(WinPanel | Sunken);
       setLineWidth(2);
       setMidLineWidth(3);
+
       //int fw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, this); // ddskrjo 0
-      int fw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); 
+      int fw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
       setIndent(fw);
+      //setContentsMargins(0,0,0,0);  // REMOVE Tim. Or keep and remove above three lines.
+      
       updateValue();
       }
 
diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp
index 106de6f6..2198bbb4 100644
--- a/muse2/muse/widgets/tb1.cpp
+++ b/muse2/muse/widgets/tb1.cpp
@@ -97,18 +97,18 @@ Toolbar1::Toolbar1(QWidget* parent, int r, bool sp)
       raster = new LabelCombo(tr("Snap"), 0);
       raster->setFocusPolicy(Qt::TabFocus);
 
-      rlist = new QTableWidget(10, 3);    
-      rlist->verticalHeader()->setDefaultSectionSize(22);                      
-      rlist->horizontalHeader()->setDefaultSectionSize(32);                      
-      rlist->setSelectionMode(QAbstractItemView::SingleSelection);                      
-      rlist->verticalHeader()->hide();                        
-      rlist->horizontalHeader()->hide();                      
-      
+      rlist = new QTableWidget(10, 3);
+      rlist->verticalHeader()->setDefaultSectionSize(22);
+      rlist->horizontalHeader()->setDefaultSectionSize(32);
+      rlist->setSelectionMode(QAbstractItemView::SingleSelection);
+      rlist->verticalHeader()->hide();
+      rlist->horizontalHeader()->hide();
+
       rlist->setMinimumWidth(96);
-      
-      raster->setView(rlist);              
-      
-      for (int j = 0; j < 3; j++)                                                 
+
+      raster->setView(rlist);
+
+      for (int j = 0; j < 3; j++)
         for (int i = 0; i < 10; i++)
           rlist->setItem(i, j, new QTableWidgetItem(tr(rasterStrings[i + j * 10])));