Set focus on the part filter when showing the parts toolbar.

leozide · Oct 26, 2024 · bf3f1d5 · bf3f1d5
1 parent 11e9958
commit bf3f1d5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp
@@ -1906,9 +1906,12 @@ void lcMainWindow::ResetViews()
 void lcMainWindow::ToggleDockWidget(QWidget* DockWidget)
 {
 	if (DockWidget->isHidden())
+	{
 		DockWidget->show();
+		DockWidget->raise();
+	}
 	else
-		DockWidget->hide();
+		DockWidget->close();
 }
 
 void lcMainWindow::TogglePrintPreview()
@@ -2812,6 +2815,8 @@ void lcMainWindow::HandleCommand(lcCommandId CommandId)
 
 	case LC_VIEW_TOOLBAR_PARTS:
 		ToggleDockWidget(mPartsToolBar);
+		if (mPartsToolBar->isVisible())
+			mPartSelectionWidget->FocusPartFilterWidget();
 		break;
 
 	case LC_VIEW_TOOLBAR_COLORS:

diff --git a/common/lc_partselectionwidget.cpp b/common/lc_partselectionwidget.cpp
@@ -676,7 +676,7 @@ lcPartSelectionWidget::lcPartSelectionWidget(QWidget* Parent)
 	PartsLayout->addLayout(SearchLayout);
 
 	mFilterWidget = new QLineEdit(PartsGroupWidget);
-	mFilterWidget->setPlaceholderText(tr("Search Parts"));
+	mFilterWidget->setPlaceholderText(tr("Filter Parts"));
 	SearchLayout->addWidget(mFilterWidget);
 
 	QToolButton* OptionsButton = new QToolButton();

diff --git a/common/lc_partselectionwidget.h b/common/lc_partselectionwidget.h
@@ -239,6 +239,12 @@ class lcPartSelectionWidget : public QWidget
 		return mPartsWidget->GetCurrentPart();
 	}
 
+	void FocusPartFilterWidget() const
+	{
+		mFilterWidget->setFocus();
+		mFilterWidget->selectAll();
+	}
+
 signals:
 	void PartPicked(PieceInfo* Info);
 	void CurrentPartChanged(PieceInfo* Info);

diff --git a/qt/lc_qutils.cpp b/qt/lc_qutils.cpp
@@ -196,6 +196,8 @@ void lcPieceIdPickerPopup::showEvent(QShowEvent* ShowEvent)
 
 	mPartSelectionWidget->SetOrientation(Qt::Horizontal);
 	mPartSelectionWidget->SetCurrentPart(mInitialPart);
+
+	mPartSelectionWidget->FocusPartFilterWidget();
 }
 
 void lcPieceIdPickerPopup::Accept()