kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-25 07:24:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep a tabbed Selection properties panel from locking its tab stack

Browse Source 
Since #1572 the empty Selection properties panel shrinks to its title bar.
When it shares a tab stack with another panel, such as Collections, Qt
gives the whole stack the smallest maximum height of its tabs, so the
stack could not be resized while nothing was selected and snapped back
small on every deselect.

The panel now shrinks only when it is not tabbed. While tabbed it keeps the
normal size limits and skips remembering and restoring the area heights,
which would otherwise bring back heights from before it was tabbed.

tst_selectionpanelheight gets a tabbed case: the stack can be made taller
with nothing selected, keeps its height through a select and deselect, and
the panel shrinks again once untabbed.
This commit is contained in:
Jeff Patterson
2026-10-23 05:35:41 -05:00
parent 38107d4d73
commit bf940a7205
3 changed files with 118 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/PropertiesEditor/propertieseditordockwidget.cpp
+51 -1
View File
@@ -32,6 +32,13 @@ PropertiesEditorDockWidget::PropertiesEditorDockWidget(QWidget *parent) :
ui(new Ui::PropertiesEditorDockWidget)
{
ui->setupUi(this);
// Tabbed or not can change without the selection changing
connect(this, &QDockWidget::dockLocationChanged,
this, &PropertiesEditorDockWidget::updateSizeConstraint);
connect(this, &QDockWidget::topLevelChanged,
this, &PropertiesEditorDockWidget::updateSizeConstraint);
connect(this, &QDockWidget::visibilityChanged,
this, &PropertiesEditorDockWidget::updateSizeConstraint);
}
/**
@@ -62,6 +69,7 @@ void PropertiesEditorDockWidget::clear()
}
m_editor_list.clear();
updateSizeConstraint();
}
/**
@@ -105,6 +113,7 @@ bool PropertiesEditorDockWidget::addEditor(PropertiesEditorWidget *editor,
m_editor_list << editor;
if (was_empty)
restoreHeight();
updateSizeConstraint();
return true;
}
@@ -133,6 +142,7 @@ bool PropertiesEditorDockWidget::removeEditor(PropertiesEditorWidget *editor)
bool result = m_editor_list.removeOne(editor);
if (result)
ui -> m_main_vlayout -> removeWidget(editor);
updateSizeConstraint();
return result;
}
@@ -150,6 +160,12 @@ void PropertiesEditorDockWidget::rememberHeight()
// before the heights were given back
if (m_restore_pending || isFloating() || !isVisible())
return;
// A tabbed dock does not shrink: nothing to give back
if (isTabbed()) {
m_area_docks.clear();
m_area_heights.clear();
return;
}
auto main_window = qobject_cast<QMainWindow *>(parentWidget());
if (!main_window)
return;
@@ -187,7 +203,7 @@ void PropertiesEditorDockWidget::restoreHeight()
m_restore_pending = false;
auto main_window = qobject_cast<QMainWindow *>(parentWidget());
if (!main_window || isFloating() || !isVisible()
|| m_editor_list.isEmpty())
|| m_editor_list.isEmpty() || isTabbed())
return;
QList<QDockWidget *> docks;
@@ -208,3 +224,37 @@ void PropertiesEditorDockWidget::restoreHeight()
main_window->resizeDocks(docks, heights, Qt::Vertical);
});
}
/**
@brief PropertiesEditorDockWidget::updateSizeConstraint
The empty dock shrinks to its title bar, but not while it shares a tab
stack with other docks: the stack takes the smallest maximum height of
its tabs, so the empty dock would hold every other tab at its title bar
and the stack could not be resized.
*/
void PropertiesEditorDockWidget::updateSizeConstraint()
{
const bool tabbed = isTabbed();
const QLayout::SizeConstraint constraint = tabbed
? QLayout::SetDefaultConstraint
: QLayout::SetMaximumSize;
if (ui->verticalLayout->sizeConstraint() == constraint)
return;
ui->verticalLayout->setSizeConstraint(constraint);
// SetMaximumSize left its maximum on the contents
if (tabbed)
ui->dockWidgetContents->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
}
/**
@brief PropertiesEditorDockWidget::isTabbed
@return true if this dock shares a tab stack with other docks
*/
bool PropertiesEditorDockWidget::isTabbed() const
{
auto main_window = qobject_cast<QMainWindow *>(parentWidget());
return main_window && !isFloating()
&& !main_window->tabifiedDockWidgets(
const_cast<PropertiesEditorDockWidget *>(this)).isEmpty();
}