author | mickeyl <mickeyl> | 2005-08-25 11:01:04 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-25 11:01:04 (UTC) |
commit | 193c968b94fd6db646af8a3588e90982a20e3fc5 (patch) (unidiff) | |
tree | c3b8e484b522bb10c1a6a9f65bb72bc421ac8479 | |
parent | 938d1f0a0c16a8acbd7866191d099a4054c4c3e2 (diff) | |
download | opie-193c968b94fd6db646af8a3588e90982a20e3fc5.zip opie-193c968b94fd6db646af8a3588e90982a20e3fc5.tar.gz opie-193c968b94fd6db646af8a3588e90982a20e3fc5.tar.bz2 |
revert last change which made dialogs appear as small windows on 240x320 models
-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 286c6ef..19e99f2 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -204,49 +204,49 @@ public: | |||
204 | } | 204 | } |
205 | QPoint p; | 205 | QPoint p; |
206 | QSize s; | 206 | QSize s; |
207 | bool max; | 207 | bool max; |
208 | 208 | ||
209 | if ( mw->isVisible() ) { | 209 | if ( mw->isVisible() ) { |
210 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 210 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
211 | mw->resize(s); | 211 | mw->resize(s); |
212 | mw->move(p); | 212 | mw->move(p); |
213 | } | 213 | } |
214 | mw->raise(); | 214 | mw->raise(); |
215 | } else { | 215 | } else { |
216 | 216 | ||
217 | if ( mw->layout() && mw->inherits("QDialog") ) { | 217 | if ( mw->layout() && mw->inherits("QDialog") ) { |
218 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 218 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
219 | mw->resize(s); | 219 | mw->resize(s); |
220 | mw->move(p); | 220 | mw->move(p); |
221 | 221 | ||
222 | if ( max && !nomaximize ) { | 222 | if ( max && !nomaximize ) { |
223 | mw->showMaximized(); | 223 | mw->showMaximized(); |
224 | } else { | 224 | } else { |
225 | mw->show(); | 225 | mw->show(); |
226 | } | 226 | } |
227 | } else { | 227 | } else { |
228 | QPEApplication::showDialog((QDialog*)mw, !nomaximize); | 228 | QPEApplication::showDialog((QDialog*)mw,nomaximize); |
229 | } | 229 | } |
230 | } else { | 230 | } else { |
231 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 231 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
232 | mw->resize(s); | 232 | mw->resize(s); |
233 | mw->move(p); | 233 | mw->move(p); |
234 | } else { //no stored rectangle, make an estimation | 234 | } else { //no stored rectangle, make an estimation |
235 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; | 235 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; |
236 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; | 236 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; |
237 | mw->move( QMAX(x,0), QMAX(y,0) ); | 237 | mw->move( QMAX(x,0), QMAX(y,0) ); |
238 | #ifdef Q_WS_QWS | 238 | #ifdef Q_WS_QWS |
239 | if ( !nomaximize ) | 239 | if ( !nomaximize ) |
240 | mw->showMaximized(); | 240 | mw->showMaximized(); |
241 | #endif | 241 | #endif |
242 | } | 242 | } |
243 | if ( max && !nomaximize ) | 243 | if ( max && !nomaximize ) |
244 | mw->showMaximized(); | 244 | mw->showMaximized(); |
245 | else | 245 | else |
246 | mw->show(); | 246 | mw->show(); |
247 | } | 247 | } |
248 | } | 248 | } |
249 | } | 249 | } |
250 | 250 | ||
251 | static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) | 251 | static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s) |
252 | { | 252 | { |