equal
deleted
inserted
replaced
101 rects = new QVector<QRect>(); |
101 rects = new QVector<QRect>(); |
102 workrects = new QVector<QRect>(); |
102 workrects = new QVector<QRect>(); |
103 |
103 |
104 rects->resize(QDesktopWidgetPrivate::screenCount); |
104 rects->resize(QDesktopWidgetPrivate::screenCount); |
105 workrects->resize(QDesktopWidgetPrivate::screenCount); |
105 workrects->resize(QDesktopWidgetPrivate::screenCount); |
|
106 |
|
107 (*rects)[0].setRect(0, 0, S60->screenWidthInPixels, S60->screenHeightInPixels); |
|
108 QRect wr = qt_TRect2QRect(static_cast<CEikAppUi*>(S60->appUi())->ClientRect()); |
|
109 (*workrects)[0].setRect(wr.x(), wr.y(), wr.width(), wr.height()); |
106 } |
110 } |
107 |
111 |
108 void QDesktopWidgetPrivate::cleanup() |
112 void QDesktopWidgetPrivate::cleanup() |
109 { |
113 { |
110 delete rects; |
114 delete rects; |
144 QWidget *QDesktopWidget::screen(int /* screen */) |
148 QWidget *QDesktopWidget::screen(int /* screen */) |
145 { |
149 { |
146 return this; |
150 return this; |
147 } |
151 } |
148 |
152 |
149 const QRect QDesktopWidget::availableGeometry(int /* screen */) const |
153 const QRect QDesktopWidget::availableGeometry(int screen) const |
150 { |
|
151 TRect clientRect = static_cast<CEikAppUi*>(S60->appUi())->ClientRect(); |
|
152 return qt_TRect2QRect(clientRect); |
|
153 } |
|
154 |
|
155 const QRect QDesktopWidget::screenGeometry(int /* screen */) const |
|
156 { |
154 { |
157 Q_D(const QDesktopWidget); |
155 Q_D(const QDesktopWidget); |
158 return QRect(0, 0, S60->screenWidthInPixels, S60->screenHeightInPixels); |
156 if (screen < 0 || screen >= d->screenCount) |
159 } |
157 screen = d->primaryScreen; |
|
158 |
|
159 return d->workrects->at(screen); |
|
160 } |
|
161 |
|
162 const QRect QDesktopWidget::screenGeometry(int screen) const |
|
163 { |
|
164 Q_D(const QDesktopWidget); |
|
165 if (screen < 0 || screen >= d->screenCount) |
|
166 screen = d->primaryScreen; |
|
167 |
|
168 return d->rects->at(screen); |
|
169 } |
160 |
170 |
161 int QDesktopWidget::screenNumber(const QWidget * /* widget */) const |
171 int QDesktopWidget::screenNumber(const QWidget * /* widget */) const |
162 { |
172 { |
163 return QDesktopWidgetPrivate::primaryScreen; |
173 return QDesktopWidgetPrivate::primaryScreen; |
164 } |
174 } |