author | llornkcor <llornkcor> | 2004-04-25 05:34:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-04-25 05:34:52 (UTC) |
commit | cf9cab31dc8a46d3a2d74931b2a428ca87eed0a9 (patch) (unidiff) | |
tree | 374e0fbd0e0b8bcc728f37226fcfd372cec06086 /library/qpeapplication.cpp | |
parent | 314351a00144a138b52e3e8659afc351615370d8 (diff) | |
download | opie-cf9cab31dc8a46d3a2d74931b2a428ca87eed0a9.zip opie-cf9cab31dc8a46d3a2d74931b2a428ca87eed0a9.tar.gz opie-cf9cab31dc8a46d3a2d74931b2a428ca87eed0a9.tar.bz2 |
revert change 1.76 of this file, as causes titlebars to not show on large displays
-rw-r--r-- | library/qpeapplication.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index cf76000..755fb19 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -173,13 +173,24 @@ public: | |||
173 | #if defined(OPIE_HIGH_RES_SMALL_PHY) | 173 | #if defined(OPIE_HIGH_RES_SMALL_PHY) |
174 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | 174 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { |
175 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | 175 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); |
176 | } | 176 | } |
177 | #endif | 177 | #endif |
178 | 178 | ||
179 | QPEApplication::showWidget( mw, nomaximize ); | 179 | if ( mw->layout() && mw->inherits("QDialog") ) { |
180 | QPEApplication::showDialog((QDialog*)mw, nomaximize); | ||
181 | } | ||
182 | else { | ||
183 | #ifdef Q_WS_QWS | ||
184 | if ( !nomaximize ) | ||
185 | mw->showMaximized(); | ||
186 | else | ||
187 | #endif | ||
188 | |||
189 | mw->show(); | ||
190 | } | ||
180 | } | 191 | } |
181 | static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) | 192 | static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) |
182 | { | 193 | { |
183 | /* | 194 | /* |
184 | // This works but disable it for now until it is safe to apply | 195 | // This works but disable it for now until it is safe to apply |
185 | // What is does is scan the .desktop files of all the apps for | 196 | // What is does is scan the .desktop files of all the apps for |