Skip to content

Make tags clickable in preview panel #13450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xboxones1 wants to merge 1 commit into
base: develop
Choose a base branch
from
+40 −7
Open

Make tags clickable in preview panel #13450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/gui/DatabaseWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
connect(this, SIGNAL(currentModeChanged(DatabaseWidget::Mode)), m_previewView, SLOT(setDatabaseMode(DatabaseWidget::Mode)));
connect(m_previewView, SIGNAL(entryUrlActivated(Entry*)), SLOT(openUrlForEntry(Entry*)));
connect(m_previewView, SIGNAL(copyTextRequested(const QString&)), SLOT(setClipboardTextAndMinimize(const QString&)));
connect(m_previewView, SIGNAL(tagSearchRequested(QString)), this, SIGNAL(requestSearch(QString)));
connect(m_entryView, SIGNAL(viewStateChanged()), SIGNAL(entryViewStateChanged()));
connect(m_groupView, SIGNAL(groupSelectionChanged()), SLOT(onGroupChanged()));
connect(m_groupView, &GroupView::groupFocused, this, [this] { m_previewView->setGroup(currentGroup()); });
Expand Down
1 change: 1 addition & 0 deletions src/gui/EntryPreviewWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
m_ui->entryTotpLabel->installEventFilter(this);

connect(m_ui->entryTotpButton, SIGNAL(toggled(bool)), m_ui->entryTotp, SLOT(setVisible(bool)));
connect(m_ui->entryTagsList, SIGNAL(tagClicked(QString)), this, SIGNAL(tagSearchRequested(QString)));
connect(m_ui->entryCloseButton, SIGNAL(clicked()), SLOT(hide()));
connect(m_ui->toggleUsernameButton, SIGNAL(clicked(bool)), SLOT(setUsernameVisible(bool)));
connect(m_ui->togglePasswordButton, SIGNAL(clicked(bool)), SLOT(setPasswordVisible(bool)));
Expand Down
1 change: 1 addition & 0 deletions src/gui/EntryPreviewWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public slots:
signals:
void entryUrlActivated(Entry* entry);
void copyTextRequested(const QString& text);
void tagSearchRequested(const QString& search);

protected:
bool eventFilter(QObject* object, QEvent* event) override;
Expand Down
43 changes: 36 additions & 7 deletions src/gui/tag/TagsEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,23 @@ void TagsEdit::timerEvent(QTimerEvent* event)

void TagsEdit::mousePressEvent(QMouseEvent* event)
{
if (m_readOnly) {
for (int i = 0; i < impl->tags.size(); ++i) {
if (!impl->tags[i].isEmpty()
&& impl->tags[i]
.rect.translated(-horizontalScrollBar()->value(), -verticalScrollBar()->value())
.contains(event->pos())) {
auto tag = impl->tags[i].text;
tag.replace("\"", "\\\"");
emit tagClicked(QString("tag:\"%1\"").arg(tag));
event->accept();
return;
}
}
event->ignore();
return;
}

bool found = false;
for (int i = 0; i < impl->tags.size(); ++i) {
if (impl->inCrossArea(i, event->pos())) {
Expand Down Expand Up @@ -940,19 +957,31 @@ QStringList TagsEdit::tags() const

void TagsEdit::mouseMoveEvent(QMouseEvent* event)
{
if (!m_readOnly) {
if (m_readOnly) {
for (int i = 0; i < impl->tags.size(); ++i) {
if (impl->inCrossArea(i, event->pos())) {
viewport()->setCursor(Qt::ArrowCursor);
if (!impl->tags[i].isEmpty()

@varjolintu varjolintu Jun 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This same if sentence is repeated in the code. Maybe make it work as a separate function?

&& impl->tags[i]
.rect.translated(-horizontalScrollBar()->value(), -verticalScrollBar()->value())
.contains(event->pos())) {
viewport()->setCursor(Qt::PointingHandCursor);
return;
}
}
if (impl->contentsRect().contains(event->pos())) {
viewport()->setCursor(Qt::IBeamCursor);
} else {
QAbstractScrollArea::mouseMoveEvent(event);
viewport()->setCursor(Qt::ArrowCursor);
return;
}

for (int i = 0; i < impl->tags.size(); ++i) {
if (impl->inCrossArea(i, event->pos())) {
viewport()->setCursor(Qt::ArrowCursor);
return;
}
}
if (impl->contentsRect().contains(event->pos())) {
viewport()->setCursor(Qt::IBeamCursor);
} else {
QAbstractScrollArea::mouseMoveEvent(event);
}
}

bool TagsEdit::isAcceptableInput(const QKeyEvent* event) const
Expand Down
1 change: 1 addition & 0 deletions src/gui/tag/TagsEdit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class TagsEdit : public QAbstractScrollArea

signals:
void tagsEdited();
void tagClicked(const QString& search);

protected:
// QWidget
Expand Down
Loading