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

Prepare for QDesktopWidget removal

Browse Source 
Change-Id: I9aa2eadea16b5795ee2c4e7b21a24f356cfd3b03
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Christian Stenger
2020-08-06 13:42:30 +02:00
committed by hjk
parent a71dbd4b33
commit 30cdae912f
8 changed files with 36 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -47,9 +47,9 @@
#include <QVBoxLayout>
#include <QListView>
#include <QAbstractItemView>
#include <QScreen>
#include <QScrollBar>
#include <QKeyEvent>
#include <QDesktopWidget>
#include <QLabel>
#include <QStyledItemDelegate>
@@ -143,10 +143,7 @@ public:
// Workaround QTCREATORBUG-11653
void calculateMaximumWidth()
{
const QDesktopWidget *desktopWidget = QApplication::desktop();
const int desktopWidth = desktopWidget->isVirtualDesktop()
? desktopWidget->width()
: desktopWidget->availableGeometry(desktopWidget->primaryScreen()).width();
const int desktopWidth = screen()->availableGeometry().width();
const QMargins widgetMargins = contentsMargins();
const QMargins layoutMargins = layout()->contentsMargins();
const int margins = widgetMargins.left() + widgetMargins.right()
@@ -531,10 +528,7 @@ void GenericProposalWidget::updatePositionAndSize()
const int height = shint.height() + fw * 2;
// Determine the position, keeping the popup on the screen
const QDesktopWidget *desktop = QApplication::desktop();
const QRect screen = HostOsInfo::isMacHost()
? desktop->availableGeometry(desktop->screenNumber(d->m_underlyingWidget))
: desktop->screenGeometry(desktop->screenNumber(d->m_underlyingWidget));
const QRect screen = d->m_underlyingWidget->screen()->availableGeometry();
QPoint pos = d->m_displayRect.bottomLeft();
pos.rx() -= 16 + fw; // Space for the icons