-rw-r--r-- | library/qpeapplication.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 5ce3011..10c6c40 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -198,73 +198,48 @@ public: | |||
198 | } | 198 | } |
199 | } else { | 199 | } else { |
200 | qpe_show_dialog((QDialog*)mw,nomaximize); | 200 | qpe_show_dialog((QDialog*)mw,nomaximize); |
201 | } | 201 | } |
202 | } else { | 202 | } else { |
203 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 203 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
204 | mw->resize(s); | 204 | mw->resize(s); |
205 | mw->move(p); | 205 | mw->move(p); |
206 | } else { //no stored rectangle, make an estimation | 206 | } else { //no stored rectangle, make an estimation |
207 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; | 207 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; |
208 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; | 208 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; |
209 | mw->move( QMAX(x,0), QMAX(y,0) ); | 209 | mw->move( QMAX(x,0), QMAX(y,0) ); |
210 | #ifdef Q_WS_QWS | 210 | #ifdef Q_WS_QWS |
211 | if ( !nomaximize ) | 211 | if ( !nomaximize ) |
212 | mw->showMaximized(); | 212 | mw->showMaximized(); |
213 | #endif | 213 | #endif |
214 | } | 214 | } |
215 | if ( max && !nomaximize ) | 215 | if ( max && !nomaximize ) |
216 | mw->showMaximized(); | 216 | mw->showMaximized(); |
217 | else | 217 | else |
218 | mw->show(); | 218 | mw->show(); |
219 | } | 219 | } |
220 | } | 220 | } |
221 | } | 221 | } |
222 | // // ugly hack, remove that later after finding a sane solution | ||
223 | // // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, | ||
224 | // // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has | ||
225 | // // a (physically) large enough display to use the small icons | ||
226 | // #if defined(OPIE_HIGH_RES_SMALL_PHY) | ||
227 | // if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | ||
228 | // ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | ||
229 | // } | ||
230 | // #endif | ||
231 | |||
232 | // if ( mw->layout() && mw->inherits("QDialog") ) { | ||
233 | // QPEApplication::showDialog((QDialog*)mw, nomaximize); | ||
234 | // } | ||
235 | // else { | ||
236 | // #ifdef Q_WS_QWS | ||
237 | // if ( !nomaximize ) { | ||
238 | // qDebug("QDialog special case XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); | ||
239 | // mw->showMaximized(); | ||
240 | // //QPEApplication::showWidget( mw, !nomaximize ); | ||
241 | // }else | ||
242 | // #endif | ||
243 | // mw->show(); | ||
244 | // } | ||
245 | //} | ||
246 | |||
247 | 222 | ||
248 | static void qpe_show_dialog( QDialog* d, bool nomax ) | 223 | static void qpe_show_dialog( QDialog* d, bool nomax ) |
249 | { | 224 | { |
250 | QSize sh = d->sizeHint(); | 225 | QSize sh = d->sizeHint(); |
251 | int w = QMAX(sh.width(),d->width()); | 226 | int w = QMAX(sh.width(),d->width()); |
252 | int h = QMAX(sh.height(),d->height()); | 227 | int h = QMAX(sh.height(),d->height()); |
253 | 228 | ||
254 | if ( d->parentWidget() && !d->parentWidget()->topLevelWidget()->isMaximized() ) | 229 | if ( d->parentWidget() && !d->parentWidget()->topLevelWidget()->isMaximized() ) |
255 | nomax = TRUE; | 230 | nomax = TRUE; |
256 | 231 | ||
257 | #ifndef Q_WS_QWS | 232 | #ifndef Q_WS_QWS |
258 | QSize s(qApp->desktop()->width(), qApp->desktop()->height() ); | 233 | QSize s(qApp->desktop()->width(), qApp->desktop()->height() ); |
259 | #else | 234 | #else |
260 | QSize s(qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | 235 | QSize s(qt_maxWindowRect.width(), qt_maxWindowRect.height() ); |
261 | #endif | 236 | #endif |
262 | 237 | ||
263 | int maxX = s.width() - (d->frameGeometry().width() - d->geometry().width()); | 238 | int maxX = s.width() - (d->frameGeometry().width() - d->geometry().width()); |
264 | int maxY = s.height() - (d->frameGeometry().height() - d->geometry().height()); | 239 | int maxY = s.height() - (d->frameGeometry().height() - d->geometry().height()); |
265 | 240 | ||
266 | if ( (w >= maxX && h >= maxY) || ( (!nomax) && ( w > s.width()*3/4 || h > s.height()*3/4 ) ) ) { | 241 | if ( (w >= maxX && h >= maxY) || ( (!nomax) && ( w > s.width()*3/4 || h > s.height()*3/4 ) ) ) { |
267 | d->showMaximized(); | 242 | d->showMaximized(); |
268 | } else { | 243 | } else { |
269 | // try centering the dialog around its parent | 244 | // try centering the dialog around its parent |
270 | QPoint p(0,0); | 245 | QPoint p(0,0); |