feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Fix focus issue in LogChangeWidget

Browse Source 
Workaround QTBUG-89156.

Change-Id: Ia128db1c0c2ee85985b6a725b6cb849d87844668
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2022-10-26 22:41:24 +03:00
committed by Orgad Shaneh
parent b65205ed97
commit e61e92d016
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/git/logchangedialog.cpp
View File

@@ -19,6 +19,7 @@
#include <QPainter> #include <QPainter>
#include <QPushButton> #include <QPushButton>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QTimer>
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
@@ -75,7 +76,7 @@ LogChangeWidget::LogChangeWidget(QWidget *parent)
setSelectionBehavior(QAbstractItemView::SelectRows); setSelectionBehavior(QAbstractItemView::SelectRows);
setActivationMode(Utils::DoubleClickActivation); setActivationMode(Utils::DoubleClickActivation);
connect(this, &LogChangeWidget::activated, this, &LogChangeWidget::emitCommitActivated); connect(this, &LogChangeWidget::activated, this, &LogChangeWidget::emitCommitActivated);
setFocus(); QTimer::singleShot(0, [this] { setFocus(); });
} }
bool LogChangeWidget::init(const FilePath &repository, const QString &commit, LogFlags flags) bool LogChangeWidget::init(const FilePath &repository, const QString &commit, LogFlags flags)
@@ -211,16 +212,15 @@ const QStandardItem *LogChangeWidget::currentItem(int column) const
LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) :
QDialog(parent) QDialog(parent)
, m_widget(new LogChangeWidget) , m_widget(new LogChangeWidget)
, m_dialogButtonBox(new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this))
, m_dialogButtonBox(new QDialogButtonBox(this))
{ {
auto layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);
layout->addWidget(new QLabel(isReset ? Tr::tr("Reset to:") : Tr::tr("Select change:"), this)); layout->addWidget(new QLabel(isReset ? Tr::tr("Reset to:") : Tr::tr("Select change:"), this));
layout->addWidget(m_widget); layout->addWidget(m_widget);
auto popUpLayout = new QHBoxLayout; auto popUpLayout = new QHBoxLayout;
if (isReset) { if (isReset) {
popUpLayout->addWidget(new QLabel(Tr::tr("Reset type:"), this)); popUpLayout->addWidget(new QLabel(Tr::tr("Reset type:")));
m_resetTypeComboBox = new QComboBox(this); m_resetTypeComboBox = new QComboBox;
m_resetTypeComboBox->addItem(Tr::tr("Hard"), "--hard"); m_resetTypeComboBox->addItem(Tr::tr("Hard"), "--hard");
m_resetTypeComboBox->addItem(Tr::tr("Mixed"), "--mixed"); m_resetTypeComboBox->addItem(Tr::tr("Mixed"), "--mixed");
m_resetTypeComboBox->addItem(Tr::tr("Soft"), "--soft"); m_resetTypeComboBox->addItem(Tr::tr("Soft"), "--soft");
@@ -230,8 +230,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) :
} }
popUpLayout->addWidget(m_dialogButtonBox); popUpLayout->addWidget(m_dialogButtonBox);
m_dialogButtonBox->addButton(QDialogButtonBox::Cancel); QPushButton *okButton = m_dialogButtonBox->button(QDialogButtonBox::Ok);
QPushButton *okButton = m_dialogButtonBox->addButton(QDialogButtonBox::Ok);
layout->addLayout(popUpLayout); layout->addLayout(popUpLayout);
connect(m_dialogButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(m_dialogButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);