From e75620c60d4e55b167dce16016e4d8d63a792c49 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 28 Apr 2015 07:11:54 +0200 Subject: [PATCH] Editor: Limit size of generic proposal widget. Task-number: QTCREATORBUG-14331 Change-Id: I3a120c82628e3cd43f9abc3c97021a3674300fbc Reviewed-by: Christian Stenger --- src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 6996048bffa..0c974729ccc 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -531,10 +531,10 @@ void GenericProposalWidget::updatePositionAndSize() QPoint pos = d->m_displayRect.bottomLeft(); pos.rx() -= 16 + fw; // Space for the icons if (pos.y() + height > screen.bottom()) - pos.setY(d->m_displayRect.top() - height); + pos.setY(qMax(0, d->m_displayRect.top() - height)); if (pos.x() + width > screen.right()) - pos.setX(screen.right() - width); - setGeometry(pos.x(), pos.y(), width, height); + pos.setX(qMax(0, screen.right() - width)); + setGeometry(pos.x(), pos.y(), qMin(width, screen.width()), qMin(height, screen.height())); } void GenericProposalWidget::turnOffAutoWidth()