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

Core: Consider scroll bar when positioning the VariableChooser

Browse Source 
Change-Id: Ia9fcade4f32bc852d5519c984b6e84ab443e044e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2020-08-11 20:35:58 +02:00
parent 1f72edcda9
commit da3b83589b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -42,6 +42,7 @@
#include <QMenu> #include <QMenu>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QPointer> #include <QPointer>
#include <QScrollBar>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QTextEdit> #include <QTextEdit>
#include <QTimer> #include <QTimer>
@@ -466,9 +467,15 @@ void VariableChooserPrivate::updateButtonGeometry()
{ {
QWidget *current = currentWidget(); QWidget *current = currentWidget();
int margin = buttonMargin(); int margin = buttonMargin();
int rightPadding = 0;
if (const auto scrollArea = qobject_cast<const QAbstractScrollArea*>(current)) {
rightPadding = m_textEdit->verticalScrollBar()->isVisible() ?
m_textEdit->verticalScrollBar()->width() : 0;
}
m_iconButton->setGeometry(current->rect().adjusted( m_iconButton->setGeometry(current->rect().adjusted(
current->width() - (margin + 4), 0, current->width() - (margin + 4), 0,
0, -qMax(0, current->height() - (margin + 4)))); 0, -qMax(0, current->height() - (margin + 4)))
.translated(-rightPadding, 0));
} }
void VariableChooserPrivate::updateCurrentEditor(QWidget *old, QWidget *widget) void VariableChooserPrivate::updateCurrentEditor(QWidget *old, QWidget *widget)
@@ -629,7 +636,7 @@ bool VariableChooser::eventFilter(QObject *obj, QEvent *event)
if ((event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride) && isVisible()) { if ((event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride) && isVisible()) {
auto ke = static_cast<QKeyEvent *>(event); auto ke = static_cast<QKeyEvent *>(event);
return handleEscapePressed(ke, this); return handleEscapePressed(ke, this);
} else if (event->type() == QEvent::Resize) { } else if (event->type() == QEvent::Resize || event->type() == QEvent::LayoutRequest) {
d->updateButtonGeometry(); d->updateButtonGeometry();
} else if (event->type() == QEvent::Hide) { } else if (event->type() == QEvent::Hide) {
close(); close();