comparison view/PaneStack.cpp @ 1460:69b7fdd6394f

Add option to suppress close button on first pane

 
 PaneStack::PaneStack(QWidget *parent, ViewManager *viewManager) :
     QFrame(parent),
     m_currentPane(nullptr),
     m_showAccessories(true),
+    m_showCloseButtonOnFirstPane(true),
     m_showAlignmentViews(false),
     m_splitter(new QSplitter),
     m_autoResizeStack(new QWidget),
     m_propertyStackStack(new QStackedWidget),
     m_viewManager(viewManager),

 {
     m_showAccessories = show;
 }
 
 void
+PaneStack::setShowCloseButtonOnFirstPane(bool show)
+{
+    m_showCloseButtonOnFirstPane = show;
+}
+
+void
 PaneStack::setShowAlignmentViews(bool show)
 {
     m_showAlignmentViews = show;
     // each alignment view shows alignment between the pane above and
     // the pane it is attached to: so pane 0 doesn't have a visible one

     QPushButton *xButton = new QPushButton(frame);
     xButton->setIcon(IconLoader().load("cross"));
     xButton->setFixedSize(QSize(16, 16));
     xButton->setFlat(true);
     xButton->setVisible(m_showAccessories);
+    if (m_panes.empty() && !m_showCloseButtonOnFirstPane) {
+        xButton->setVisible(false);
+    }
     layout->addWidget(xButton, 1, 0);
     connect(xButton, SIGNAL(clicked()), this, SLOT(paneDeleteButtonClicked()));
 
     ClickableLabel *currentIndicator = new ClickableLabel(frame);
     connect(currentIndicator, SIGNAL(clicked()), this, SLOT(indicatorClicked()));
     layout->addWidget(currentIndicator, 2, 0);
     layout->setRowStretch(1, 20);
-    currentIndicator->setMinimumWidth(8);
+    currentIndicator->setMinimumWidth(16);
+    currentIndicator->setMinimumHeight(16);
     currentIndicator->setScaledContents(true);
     currentIndicator->setVisible(m_showAccessories);
 
     sv_frame_t initialCentreFrame = -1;
     if (!m_panes.empty()) {

 #endif
 
     bool multi = (getPaneCount() > 1);
     for (std::vector<PaneRec>::iterator i = m_panes.begin();
          i != m_panes.end(); ++i) {
-        i->xButton->setVisible(multi && m_showAccessories);
-        i->currentIndicator->setVisible(multi && m_showAccessories);
+        bool visible = (multi && m_showAccessories);
+        bool xvisible = visible;
+        if (i == m_panes.begin()) {
+            if (!m_showCloseButtonOnFirstPane) {
+                xvisible = false;
+            }
+        }
+        i->xButton->setVisible(xvisible);
+        i->currentIndicator->setVisible(visible);
     }
 }
 
 int
 PaneStack::getPaneCount() const