mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-03 12:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor style fixes (#11445)

Browse source 
* Clean up removed elements in qt stylesheets
* Disable main window when saving
* Fixed triangle size in group view

---------

Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
xboxones1 2025-01-02 12:23:27 +09:00 • committed by GitHub
parent fb022cb5e9
commit 2afec91e87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gui/DatabaseWidget.cpp
View file

@ -2393,9 +2393,10 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
QPointer<QWidget> focusWidget(qApp->focusWidget()); QPointer<QWidget> focusWidget(qApp->focusWidget());
// Lock out interactions // Lock out interactions
m_entryView->setDisabled(true); auto mainWindow = getMainWindow();
m_groupView->setDisabled(true); if (mainWindow) {
m_tagView->setDisabled(true); mainWindow->setDisabled(true);
}
QApplication::processEvents(); QApplication::processEvents();
Database::SaveAction saveAction = Database::Atomic; Database::SaveAction saveAction = Database::Atomic;
@ -2435,9 +2436,9 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
} }
// Return control // Return control
m_entryView->setDisabled(false); if (mainWindow) {
m_groupView->setDisabled(false); mainWindow->setDisabled(false);
m_tagView->setDisabled(false); }
if (focusWidget && focusWidget->isVisible()) { if (focusWidget && focusWidget->isVisible()) {
focusWidget->setFocus(); focusWidget->setFocus();

2
src/gui/styles/base/BaseStyle.cpp
View file

@ -1029,7 +1029,7 @@ namespace Phantom
// Expected time (release): 5usecs for regular-sized arrows // Expected time (release): 5usecs for regular-sized arrows
Q_NEVER_INLINE void drawArrow(QPainter* p, QRect rect, Qt::ArrowType arrowDirection, const QBrush& brush) Q_NEVER_INLINE void drawArrow(QPainter* p, QRect rect, Qt::ArrowType arrowDirection, const QBrush& brush)
{ {
const qreal ArrowBaseRatio = 0.9; const qreal ArrowBaseRatio = 1.0;
qreal irx, iry, irw, irh; qreal irx, iry, irw, irh;
QRectF(rect).getRect(&irx, &iry, &irw, &irh); QRectF(rect).getRect(&irx, &iry, &irw, &irh);
if (irw < 1.0 || irh < 1.0) if (irw < 1.0 || irh < 1.0)

4
src/gui/styles/dark/darkstyle.qss
View file

@ -1,11 +1,11 @@
DatabaseWidget:!active, GroupView:!active, DatabaseWidget:!active,
DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active, DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active,
EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active, EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active,
EntryPreviewWidget TagsEdit:!active, QStatusBar:!active { EntryPreviewWidget TagsEdit:!active, QStatusBar:!active {
background-color: #404042; background-color: #404042;
} }
DatabaseWidget:disabled, GroupView:disabled, DatabaseWidget:disabled,
DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled, DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled,
EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled, EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled,
EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled { EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled {

4
src/gui/styles/light/lightstyle.qss
View file

@ -1,11 +1,11 @@
DatabaseWidget:!active, GroupView:!active, DatabaseWidget:!active,
DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active, DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active,
EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active, EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active,
EntryPreviewWidget TagsEdit:!active, QStatusBar:!active { EntryPreviewWidget TagsEdit:!active, QStatusBar:!active {
background-color: #FCFCFC; background-color: #FCFCFC;
} }
DatabaseWidget:disabled, GroupView:disabled, DatabaseWidget:disabled,
DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled, DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled,
EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled, EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled,
EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled { EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled {