diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 3a19f06683..3edad4d44f 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -683,11 +683,6 @@ MainWindow::MainWindow() restoreConfigState(); updateMenuActionState(); - - // Check the current screen and hide the status bar if it is the WelcomeScreen - if (m_ui->stackedWidget->currentIndex() == WelcomeScreen) { - statusBar()->hide(); - } } MainWindow::~MainWindow() @@ -1164,10 +1159,10 @@ void MainWindow::switchToDatabases() { if (m_ui->tabWidget->currentIndex() == -1) { m_ui->stackedWidget->setCurrentIndex(WelcomeScreen); - statusBar()->hide(); + statusBar()->setAutoFillBackground(false); } else { m_ui->stackedWidget->setCurrentIndex(DatabaseTabScreen); - statusBar()->show(); + statusBar()->setAutoFillBackground(true); } } @@ -1176,6 +1171,7 @@ void MainWindow::switchToSettings(bool enabled) if (enabled) { m_ui->settingsWidget->loadSettings(); m_ui->stackedWidget->setCurrentIndex(SettingsScreen); + statusBar()->setAutoFillBackground(true); } else { switchToDatabases(); } @@ -1187,6 +1183,7 @@ void MainWindow::togglePasswordGenerator(bool enabled) m_ui->passwordGeneratorWidget->loadSettings(); m_ui->passwordGeneratorWidget->regeneratePassword(); m_ui->stackedWidget->setCurrentIndex(PasswordGeneratorScreen); + statusBar()->setAutoFillBackground(false); } else { m_ui->passwordGeneratorWidget->saveSettings(); switchToDatabases(); @@ -1276,10 +1273,10 @@ void MainWindow::databaseTabChanged(int tabIndex) { if (tabIndex != -1 && m_ui->stackedWidget->currentIndex() == WelcomeScreen) { m_ui->stackedWidget->setCurrentIndex(DatabaseTabScreen); - statusBar()->show(); + statusBar()->setAutoFillBackground(true); } else if (tabIndex == -1 && m_ui->stackedWidget->currentIndex() == DatabaseTabScreen) { m_ui->stackedWidget->setCurrentIndex(WelcomeScreen); - statusBar()->hide(); + statusBar()->setAutoFillBackground(false); } m_actionMultiplexer.setCurrentObject(m_ui->tabWidget->currentDatabaseWidget()); diff --git a/src/gui/styles/base/basestyle.qss b/src/gui/styles/base/basestyle.qss index 34cc283dd2..d5211e90ab 100644 --- a/src/gui/styles/base/basestyle.qss +++ b/src/gui/styles/base/basestyle.qss @@ -72,10 +72,6 @@ QPlainTextEdit, QTextEdit { padding-left: 4px; } -QStatusBar { - background-color: palette(window); -} - *[title="true"] { font-weight: bold; } diff --git a/src/gui/styles/dark/DarkStyle.cpp b/src/gui/styles/dark/DarkStyle.cpp index 5b021b19ad..daf16aaaca 100644 --- a/src/gui/styles/dark/DarkStyle.cpp +++ b/src/gui/styles/dark/DarkStyle.cpp @@ -113,7 +113,7 @@ QString DarkStyle::getAppStyleSheet() const void DarkStyle::polish(QWidget* widget) { if (qobject_cast(widget) || qobject_cast(widget) || qobject_cast(widget) - || qobject_cast(widget) || qobject_cast(widget)) { + || qobject_cast(widget)) { auto palette = widget->palette(); #if defined(Q_OS_MACOS) if (!osUtils->isDarkMode()) { diff --git a/src/gui/styles/dark/darkstyle.qss b/src/gui/styles/dark/darkstyle.qss index 2b0cfebc09..1f206b6ee7 100644 --- a/src/gui/styles/dark/darkstyle.qss +++ b/src/gui/styles/dark/darkstyle.qss @@ -1,14 +1,14 @@ DatabaseWidget:!active, DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active, EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active, -EntryPreviewWidget TagsEdit:!active, QStatusBar:!active { +EntryPreviewWidget TagsEdit:!active { background-color: #404042; } DatabaseWidget:disabled, DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled, EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled, -EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled { +EntryPreviewWidget TagsEdit:disabled { background-color: #424242; } diff --git a/src/gui/styles/light/LightStyle.cpp b/src/gui/styles/light/LightStyle.cpp index d20b1ef362..f739954129 100644 --- a/src/gui/styles/light/LightStyle.cpp +++ b/src/gui/styles/light/LightStyle.cpp @@ -113,7 +113,7 @@ QString LightStyle::getAppStyleSheet() const void LightStyle::polish(QWidget* widget) { if (qobject_cast(widget) || qobject_cast(widget) || qobject_cast(widget) - || qobject_cast(widget) || qobject_cast(widget)) { + || qobject_cast(widget)) { auto palette = widget->palette(); #if defined(Q_OS_MACOS) if (osUtils->isDarkMode()) { diff --git a/src/gui/styles/light/lightstyle.qss b/src/gui/styles/light/lightstyle.qss index a2b6d77699..36ad09cc85 100644 --- a/src/gui/styles/light/lightstyle.qss +++ b/src/gui/styles/light/lightstyle.qss @@ -1,14 +1,14 @@ DatabaseWidget:!active, DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active, EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active, -EntryPreviewWidget TagsEdit:!active, QStatusBar:!active { +EntryPreviewWidget TagsEdit:!active { background-color: #FCFCFC; } DatabaseWidget:disabled, DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled, EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled, -EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled { +EntryPreviewWidget TagsEdit:disabled { background-color: #EDEDED; }