Skip to content
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

Minor style fixes #11445

Merged
merged 4 commits into from
Jan 2, 2025
Merged

Minor style fixes #11445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fd5b9b
clean up removed elements
xboxones1 Nov 5, 2024
cc210d4
Disable main window when saving
xboxones1 Dec 17, 2024
b7c4f10
Fixed triangle size
xboxones1 Dec 17, 2024
1289637
Use getMainWindow
droidmonkey Dec 26, 2024
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
13 changes: 7 additions & 6 deletions src/gui/DatabaseWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2393,9 +2393,10 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
QPointer<QWidget> focusWidget(qApp->focusWidget());

// Lock out interactions
m_entryView->setDisabled(true);
m_groupView->setDisabled(true);
m_tagView->setDisabled(true);
auto mainWindow = getMainWindow();
if (mainWindow) {
mainWindow->setDisabled(true);
}
QApplication::processEvents();

Database::SaveAction saveAction = Database::Atomic;
Expand Down Expand Up @@ -2435,9 +2436,9 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
}

// Return control
m_entryView->setDisabled(false);
m_groupView->setDisabled(false);
m_tagView->setDisabled(false);
if (mainWindow) {
mainWindow->setDisabled(false);
}

if (focusWidget && focusWidget->isVisible()) {
focusWidget->setFocus();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/styles/base/BaseStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ namespace Phantom
// Expected time (release): 5usecs for regular-sized arrows
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;
QRectF(rect).getRect(&irx, &iry, &irw, &irh);
if (irw < 1.0 || irh < 1.0)
Expand Down
4 changes: 2 additions & 2 deletions src/gui/styles/dark/darkstyle.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
DatabaseWidget:!active, GroupView:!active,
DatabaseWidget:!active,
DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active,
EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active,
EntryPreviewWidget TagsEdit:!active, QStatusBar:!active {
background-color: #404042;
}

DatabaseWidget:disabled, GroupView:disabled,
DatabaseWidget:disabled,
DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled,
EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled,
EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled {
Expand Down
4 changes: 2 additions & 2 deletions src/gui/styles/light/lightstyle.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
DatabaseWidget:!active, GroupView:!active,
DatabaseWidget:!active,
DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active,
EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active,
EntryPreviewWidget TagsEdit:!active, QStatusBar:!active {
background-color: #FCFCFC;
}

DatabaseWidget:disabled, GroupView:disabled,
DatabaseWidget:disabled,
DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled,
EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled,
EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled {
Expand Down
Loading