Skip to content

Commit 9d0905a

Browse files
committed
Search result font improvement; widget name searchable
1 parent 25001ad commit 9d0905a

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

src/Interface/Application/ModuleWidget.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,11 @@ void ModuleWidget::makeOptionsDialog()
10891089
}
10901090
}
10911091

1092+
QDialog* ModuleWidget::dialog()
1093+
{
1094+
return dialog_;
1095+
}
1096+
10921097
void ModuleWidget::updateDockWidgetProperties(bool isFloating)
10931098
{
10941099
if (isFloating)

src/Interface/Application/ModuleWidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ class ModuleWidget : public QStackedWidget,
160160
};
161161

162162
QString metadataToString() const;
163+
QDialog* dialog();
163164

164165
public Q_SLOTS:
165166
virtual bool executeWithSignals() override;

src/Interface/Application/NetworkEditor.cc

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,8 @@ SearchResultItem::SearchResultItem(const QString& text, const QColor& color, std
739739
: FloatingTextItem(text, action, parent)
740740
{
741741
setDefaultTextColor(color);
742-
setHtml("<div style='background:rgba(150, 150, 150, 30%);'>" + toPlainText() + "</div>");
742+
auto backgroundGray = QString("background:rgba(%1, %1, %1, 30%)").arg(200);
743+
setHtml("<div style='" + backgroundGray + ";font: 15px Lucida, sans-serif'>" + toPlainText() + "</div>");
743744
items_.insert(this);
744745
}
745746

@@ -822,6 +823,18 @@ class NetworkSearchEngine
822823
Qt::yellow);
823824
}
824825

826+
auto dialog = mod->getModuleWidget()->dialog();
827+
if (dialog && text.length() > 5)
828+
{
829+
auto widgetMatches = dialog->findChildren<QWidget*>(QRegExp(".*" + text + ".*", Qt::CaseInsensitive));
830+
Q_FOREACH(auto widget, widgetMatches)
831+
{
832+
results.emplace_back("Module UI widget match",
833+
QString::fromStdString(id) + "::" + widget->objectName(),
834+
[mod]() { mod->showAndColor("#AA3333"); },
835+
"#AA3333");
836+
}
837+
}
825838
return results;
826839
}
827840

@@ -880,15 +893,15 @@ void NetworkEditor::searchTextChanged(const QString& text)
880893
if (!results.empty())
881894
{
882895
auto title = new SearchResultItem("Search results:", Qt::green, {});
883-
title->setPos(positionOfFloatingText(title->num(), true, 20, textScale * 20));
896+
title->setPos(positionOfFloatingText(title->num(), true, 20, textScale * 22));
884897
scene()->addItem(title);
885898
title->scale(textScale, textScale);
886899
}
887900
for (const auto& result : results)
888901
{
889902
auto searchItem = new SearchResultItem(std::get<ItemType>(result) + ": " + std::get<ItemName>(result),
890903
std::get<ItemColor>(result), std::get<ItemAction>(result));
891-
searchItem->setPos(positionOfFloatingText(searchItem->num(), true, 50, textScale * 20));
904+
searchItem->setPos(positionOfFloatingText(searchItem->num(), true, 50, textScale * 22));
892905
scene()->addItem(searchItem);
893906
searchItem->scale(textScale, textScale);
894907
}

0 commit comments

Comments
 (0)