Skip to content

Commit b10b793

Browse files
committed
Ensure tabbed components are resized properly when one is closed
1 parent 4d666c6 commit b10b793

1 file changed

Lines changed: 21 additions & 22 deletions

File tree

Source/UI/DataViewport.cpp

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -610,23 +610,8 @@ void DataViewport::removeTab (int nodeId, bool sendNotification)
610610

611611
if (foundTab)
612612
{
613-
if (draggableTabComponent->getNumTabs() == 0 && draggableTabComponents.size() > 1)
614-
{
615-
draggableTabComponents.removeObject (draggableTabComponent);
616-
activeTabbedComponent--;
617-
618-
tabbedComponentLayout.clearAllItems();
619-
620-
tabbedComponentResizer->setVisible (draggableTabComponents.size() == 2);
621-
622-
resized();
623-
624-
if (draggableTabComponents[activeTabbedComponent]->getNumTabs() > 1)
625-
addTabbedComponentButton->setVisible (true);
626-
else
627-
addTabbedComponentButton->setVisible (false);
628-
}
629-
613+
// remove the tabbed component if it's empty
614+
removeTabbedComponent (draggableTabComponent);
630615
return;
631616
}
632617
}
@@ -641,11 +626,14 @@ void DataViewport::buttonClicked (Button* button)
641626
addAndMakeVisible (d);
642627
draggableTabComponents.add (d);
643628

644-
tabbedComponentResizer->setVisible (true);
629+
if (draggableTabComponents.size() == 2)
630+
{
631+
tabbedComponentResizer->setVisible (true);
645632

646-
tabbedComponentLayout.setItemLayout (0, -0.25, -0.75, -0.5);
647-
tabbedComponentLayout.setItemLayout (1, 12, 12, 12);
648-
tabbedComponentLayout.setItemLayout (2, -0.25, -0.75, -0.5);
633+
tabbedComponentLayout.setItemLayout (0, -0.25, -0.75, -0.5);
634+
tabbedComponentLayout.setItemLayout (1, 12, 12, 12);
635+
tabbedComponentLayout.setItemLayout (2, -0.25, -0.75, -0.5);
636+
}
649637

650638
resized();
651639

@@ -684,7 +672,18 @@ void DataViewport::removeTabbedComponent (DraggableTabComponent* draggableTabCom
684672

685673
tabbedComponentLayout.clearAllItems();
686674

687-
tabbedComponentResizer->setVisible (draggableTabComponents.size() == 2);
675+
if (draggableTabComponents.size() == 2)
676+
{
677+
tabbedComponentResizer->setVisible (true);
678+
679+
tabbedComponentLayout.setItemLayout (0, -0.25, -0.75, -0.5);
680+
tabbedComponentLayout.setItemLayout (1, 12, 12, 12);
681+
tabbedComponentLayout.setItemLayout (2, -0.25, -0.75, -0.5);
682+
}
683+
else
684+
{
685+
tabbedComponentResizer->setVisible (false);
686+
}
688687

689688
resized();
690689
}

0 commit comments

Comments
 (0)