Skip to content

Commit 364eefa

Browse files
committed
Fix #105
1 parent 716790d commit 364eefa

3 files changed

Lines changed: 24 additions & 6 deletions

File tree

src/ui/layout/LayoutManipulator.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,11 @@ void LayoutManipulator::onWidgetNameChanged()
689689
CEGUIManipulator::onWidgetNameChanged();
690690
if (_treeItem) _treeItem->refreshPathData();
691691
if (_lcHandle) _lcHandle->updateTooltip();
692+
693+
// Update name in the property widget title
694+
std::set<LayoutManipulator*> selectedWidgets;
695+
_visualMode.getScene()->collectSelectedWidgets(selectedWidgets);
696+
_visualMode.getScene()->updatePropertyWidgetTitle(selectedWidgets);
692697
}
693698

694699
QPen LayoutManipulator::getNormalPen() const

src/ui/layout/LayoutScene.cpp

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,7 @@ void LayoutScene::updatePropertySet()
403403
void LayoutScene::updatePropertySet(const std::set<LayoutManipulator*>& selectedWidgets)
404404
{
405405
auto mainWindow = qobject_cast<Application*>(qApp)->getMainWindow();
406-
auto propertyDockWidget = mainWindow->getPropertyDockWidget();
407-
auto propertyWidget = static_cast<QtnPropertyWidget*>(propertyDockWidget->widget());
406+
auto propertyWidget = static_cast<QtnPropertyWidget*>(mainWindow->getPropertyDockWidget()->widget());
408407

409408
disconnect(propertyWidget->propertyView(), &QtnPropertyView::beforePropertyEdited, this, &LayoutScene::onBeforePropertyEdited);
410409

@@ -420,8 +419,6 @@ void LayoutScene::updatePropertySet(const std::set<LayoutManipulator*>& selected
420419
{
421420
auto selectedWidget = *selectedWidgets.begin();
422421
propertyWidget->setPropertySet(selectedWidget->getPropertySet());
423-
propertyDockWidget->setWindowTitle("Properties: " + selectedWidget->getWidgetName() + " (" + selectedWidget->getWidgetType() + ")");
424-
// TODO: selectedWidget->getWidgetPath() in the header tooltip (not for the whole propertyWidget tooltip!)
425422
}
426423
else if (selectedWidgets.size() > 1)
427424
{
@@ -433,13 +430,28 @@ void LayoutScene::updatePropertySet(const std::set<LayoutManipulator*>& selected
433430
qtnPropertiesToMultiSet(_multiSet, manipulator->getPropertySet(), false);
434431

435432
propertyWidget->setPropertySet(_multiSet);
436-
propertyDockWidget->setWindowTitle(QString("Properties: %1 widgets").arg(selectedWidgets.size()));
437433
}
438434
else
439435
{
440436
propertyWidget->setPropertySet(nullptr);
441-
propertyDockWidget->setWindowTitle("Properties");
442437
}
438+
439+
updatePropertyWidgetTitle(selectedWidgets);
440+
}
441+
442+
void LayoutScene::updatePropertyWidgetTitle(const std::set<LayoutManipulator*>& selectedWidgets)
443+
{
444+
auto propertyDockWidget = qobject_cast<Application*>(qApp)->getMainWindow()->getPropertyDockWidget();
445+
if (selectedWidgets.size() == 1)
446+
{
447+
auto selectedWidget = *selectedWidgets.begin();
448+
propertyDockWidget->setWindowTitle("Properties: " + selectedWidget->getWidgetName() + " (" + selectedWidget->getWidgetType() + ")");
449+
// TODO: selectedWidget->getWidgetPath() in the header tooltip (not for the whole propertyWidget tooltip!)
450+
}
451+
else if (selectedWidgets.size() > 1)
452+
propertyDockWidget->setWindowTitle(QString("Properties: %1 widgets").arg(selectedWidgets.size()));
453+
else
454+
propertyDockWidget->setWindowTitle("Properties");
443455
}
444456

445457
void LayoutScene::normalizePositionOfSelectedWidgets()

src/ui/layout/LayoutScene.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class LayoutScene : public CEGUIGraphicsScene
3939
size_t getMultiSelectionChangeId() const;
4040
void updatePropertySet();
4141
void updatePropertySet(const std::set<LayoutManipulator*>& selectedWidgets);
42+
void updatePropertyWidgetTitle(const std::set<LayoutManipulator*>& selectedWidgets);
4243

4344
void alignSelectionHorizontally(CEGUI::HorizontalAlignment alignment);
4445
void alignSelectionVertically(CEGUI::VerticalAlignment alignment);

0 commit comments

Comments
 (0)