Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-21 13:24:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Show main page when editing entry or database settings

Browse source 
* Fixes #11891
This commit is contained in:
Jonathan White 2025-05-17 16:44:36 -04:00
parent 9baf77cbc4
commit 20aefd0c7a
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/EditWidget.cpp
View file

@ -84,7 +84,7 @@ int EditWidget::pageIndex(const QWidget* widget) const
for (int i = 0; i < m_ui->stackedWidget->count(); i++) { for (int i = 0; i < m_ui->stackedWidget->count(); i++) {
auto* scrollArea = qobject_cast<QScrollArea*>(m_ui->stackedWidget->widget(i)); auto* scrollArea = qobject_cast<QScrollArea*>(m_ui->stackedWidget->widget(i));
if (scrollArea && scrollArea->widget() == widget) { if (scrollArea && (scrollArea == widget || scrollArea->widget() == widget)) {
return i; return i;
} }
} }

2
src/gui/dbsettings/DatabaseSettingsDialog.cpp
View file

@ -99,6 +99,8 @@ DatabaseSettingsDialog::~DatabaseSettingsDialog() = default;
void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db) void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db)
{ {
// Default to the main page on load
setCurrentPage(0);
setHeadline(tr("Database Settings: %1").arg(db->canonicalFilePath())); setHeadline(tr("Database Settings: %1").arg(db->canonicalFilePath()));
m_generalWidget->loadSettings(db); m_generalWidget->loadSettings(db);