summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-04-19 13:27:29 (UTC)
committer mickeyl <mickeyl>2005-04-19 13:27:29 (UTC)
commit6ec538f7e4a84e4f76addaf558c415b7dffc659b (patch) (side-by-side diff)
tree78690e386746d111033f22e997915ab537a5c350
parent9b8dd642c4b135070911c78bb5d31a7add7162ee (diff)
downloadopie-6ec538f7e4a84e4f76addaf558c415b7dffc659b.zip
opie-6ec538f7e4a84e4f76addaf558c415b7dffc659b.tar.gz
opie-6ec538f7e4a84e4f76addaf558c415b7dffc659b.tar.bz2
fix windowing on c7x0 - patch from OE
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/widget_showing.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/widget_showing.cpp b/library/widget_showing.cpp
index ee63759..e43a16a 100644
--- a/library/widget_showing.cpp
+++ b/library/widget_showing.cpp
@@ -7,73 +7,73 @@
           .>+-=
 _;:,     .>    :=|. This library is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This library is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <qtopia/qpeapplication.h>
#ifdef Q_WS_QWS
extern Q_EXPORT QRect qt_maxWindowRect;
#endif
void QPEApplication::showDialog( QDialog* d, bool nomax )
{
showWidget( d, nomax );
}
int QPEApplication::execDialog( QDialog* d, bool nomax )
{
showDialog( d, nomax );
return d->exec();
}
void QPEApplication::showWidget( QWidget* wg, bool nomax ) {
if ( wg->isVisible() ) {
wg->show();
return;
}
-#ifndef OPIE_NO_WINDOWED
+#ifdef OPIE_NO_WINDOWED
Q_UNUSED( nomax )
if ( TRUE ) {
#else
if ( !nomax
&& ( qApp->desktop()->width() <= 320 ) ){
#endif
wg->showMaximized();
} else {
#ifdef Q_WS_QWS
QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );
#else
QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() );
#endif
QSize sh = wg->sizeHint();
int w = QMAX( sh.width(), wg->width() );
int h = QMAX( sh.height(), wg->height() );
// desktop widget-frame taskbar
w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) );
h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) );
wg->resize( w, h );
wg->show();
}
}