author | llornkcor <llornkcor> | 2004-04-25 12:15:06 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-04-25 12:15:06 (UTC) |
commit | 6182b509bdb16dd4d1e95b9a570219ef6c15ed21 (patch) (unidiff) | |
tree | 681bcfd272bd1d8d4873ee94acd56d42968997c3 | |
parent | 84466242f91283378aec1b1ecda0bb27eb4f6097 (diff) | |
download | opie-6182b509bdb16dd4d1e95b9a570219ef6c15ed21.zip opie-6182b509bdb16dd4d1e95b9a570219ef6c15ed21.tar.gz opie-6182b509bdb16dd4d1e95b9a570219ef6c15ed21.tar.bz2 |
fix bigfotos
-rw-r--r-- | library/qpeapplication.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 86dbe85..d0e9613 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -114,128 +114,138 @@ public: | |||
114 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), | 114 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), |
115 | keep_running( true ), qcopQok( false ), qpe_main_widget( 0 ) | 115 | keep_running( true ), qcopQok( false ), qpe_main_widget( 0 ) |
116 | 116 | ||
117 | {} | 117 | {} |
118 | 118 | ||
119 | int presstimer; | 119 | int presstimer; |
120 | QWidget* presswidget; | 120 | QWidget* presswidget; |
121 | QPoint presspos; | 121 | QPoint presspos; |
122 | 122 | ||
123 | bool rightpressed : 1; | 123 | bool rightpressed : 1; |
124 | bool kbgrabbed : 1; | 124 | bool kbgrabbed : 1; |
125 | bool notbusysent : 1; | 125 | bool notbusysent : 1; |
126 | bool preloaded : 1; | 126 | bool preloaded : 1; |
127 | bool forceshow : 1; | 127 | bool forceshow : 1; |
128 | bool nomaximize : 1; | 128 | bool nomaximize : 1; |
129 | bool keep_running : 1; | 129 | bool keep_running : 1; |
130 | bool qcopQok : 1; | 130 | bool qcopQok : 1; |
131 | 131 | ||
132 | 132 | ||
133 | QStringList langs; | 133 | QStringList langs; |
134 | QString appName; | 134 | QString appName; |
135 | struct QCopRec | 135 | struct QCopRec |
136 | { | 136 | { |
137 | QCopRec( const QCString &ch, const QCString &msg, | 137 | QCopRec( const QCString &ch, const QCString &msg, |
138 | const QByteArray &d ) : | 138 | const QByteArray &d ) : |
139 | channel( ch ), message( msg ), data( d ) | 139 | channel( ch ), message( msg ), data( d ) |
140 | { } | 140 | { } |
141 | 141 | ||
142 | QCString channel; | 142 | QCString channel; |
143 | QCString message; | 143 | QCString message; |
144 | QByteArray data; | 144 | QByteArray data; |
145 | }; | 145 | }; |
146 | QWidget* qpe_main_widget; | 146 | QWidget* qpe_main_widget; |
147 | QGuardedPtr<QWidget> lastraised; | 147 | QGuardedPtr<QWidget> lastraised; |
148 | QQueue<QCopRec> qcopq; | 148 | QQueue<QCopRec> qcopq; |
149 | QString styleName; | 149 | QString styleName; |
150 | QString decorationName; | 150 | QString decorationName; |
151 | 151 | ||
152 | void enqueueQCop( const QCString &ch, const QCString &msg, | 152 | void enqueueQCop( const QCString &ch, const QCString &msg, |
153 | const QByteArray &data ) | 153 | const QByteArray &data ) |
154 | { | 154 | { |
155 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); | 155 | qcopq.enqueue( new QCopRec( ch, msg, data ) ); |
156 | } | 156 | } |
157 | void sendQCopQ() | 157 | void sendQCopQ() |
158 | { | 158 | { |
159 | if (!qcopQok ) | 159 | if (!qcopQok ) |
160 | return; | 160 | return; |
161 | 161 | ||
162 | QCopRec * r; | 162 | QCopRec * r; |
163 | 163 | ||
164 | while((r=qcopq.dequeue())) { | 164 | while((r=qcopq.dequeue())) { |
165 | // remove from queue before sending... | 165 | // remove from queue before sending... |
166 | // event loop can come around again before getting | 166 | // event loop can come around again before getting |
167 | // back from sendLocally | 167 | // back from sendLocally |
168 | #ifndef QT_NO_COP | 168 | #ifndef QT_NO_COP |
169 | QCopChannel::sendLocally( r->channel, r->message, r->data ); | 169 | QCopChannel::sendLocally( r->channel, r->message, r->data ); |
170 | #endif | 170 | #endif |
171 | 171 | ||
172 | delete r; | 172 | delete r; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | 175 | ||
176 | static void show_mx(QWidget* mw, bool nomaximize, QString &strName/* = QString::null */) | 176 | static void show_mx(QWidget* mw, bool nomaximize, QString &strName/* = QString::null */) |
177 | { | 177 | { |
178 | // ugly hack, remove that later after finding a sane solution | ||
179 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, | ||
180 | // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has | ||
181 | // a (physically) large enough display to use the small icons | ||
182 | #if defined(OPIE_HIGH_RES_SMALL_PHY) | ||
183 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | ||
184 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | ||
185 | } | ||
186 | #endif | ||
187 | |||
178 | QPoint p; | 188 | QPoint p; |
179 | QSize s; | 189 | QSize s; |
180 | bool max; | 190 | bool max; |
181 | if ( mw->isVisible() ) { | 191 | if ( mw->isVisible() ) { |
182 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 192 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
183 | mw->resize(s); | 193 | mw->resize(s); |
184 | mw->move(p); | 194 | mw->move(p); |
185 | } | 195 | } |
186 | mw->raise(); | 196 | mw->raise(); |
187 | } else { | 197 | } else { |
188 | 198 | ||
189 | if ( mw->layout() && mw->inherits("QDialog") ) { | 199 | if ( mw->layout() && mw->inherits("QDialog") ) { |
190 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 200 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
191 | mw->resize(s); | 201 | mw->resize(s); |
192 | mw->move(p); | 202 | mw->move(p); |
193 | 203 | ||
194 | if ( max && !nomaximize ) { | 204 | if ( max && !nomaximize ) { |
195 | mw->showMaximized(); | 205 | mw->showMaximized(); |
196 | } else { | 206 | } else { |
197 | mw->show(); | 207 | mw->show(); |
198 | } | 208 | } |
199 | } else { | 209 | } else { |
200 | qpe_show_dialog((QDialog*)mw,nomaximize); | 210 | qpe_show_dialog((QDialog*)mw,nomaximize); |
201 | } | 211 | } |
202 | } else { | 212 | } else { |
203 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { | 213 | if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) { |
204 | mw->resize(s); | 214 | mw->resize(s); |
205 | mw->move(p); | 215 | mw->move(p); |
206 | } else { //no stored rectangle, make an estimation | 216 | } else { //no stored rectangle, make an estimation |
207 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; | 217 | int x = (qApp->desktop()->width()-mw->frameGeometry().width())/2; |
208 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; | 218 | int y = (qApp->desktop()->height()-mw->frameGeometry().height())/2; |
209 | mw->move( QMAX(x,0), QMAX(y,0) ); | 219 | mw->move( QMAX(x,0), QMAX(y,0) ); |
210 | #ifdef Q_WS_QWS | 220 | #ifdef Q_WS_QWS |
211 | if ( !nomaximize ) | 221 | if ( !nomaximize ) |
212 | mw->showMaximized(); | 222 | mw->showMaximized(); |
213 | #endif | 223 | #endif |
214 | } | 224 | } |
215 | if ( max && !nomaximize ) | 225 | if ( max && !nomaximize ) |
216 | mw->showMaximized(); | 226 | mw->showMaximized(); |
217 | else | 227 | else |
218 | mw->show(); | 228 | mw->show(); |
219 | } | 229 | } |
220 | } | 230 | } |
221 | } | 231 | } |
222 | 232 | ||
223 | static void qpe_show_dialog( QDialog* d, bool nomax ) | 233 | static void qpe_show_dialog( QDialog* d, bool nomax ) |
224 | { | 234 | { |
225 | QSize sh = d->sizeHint(); | 235 | QSize sh = d->sizeHint(); |
226 | int w = QMAX(sh.width(),d->width()); | 236 | int w = QMAX(sh.width(),d->width()); |
227 | int h = QMAX(sh.height(),d->height()); | 237 | int h = QMAX(sh.height(),d->height()); |
228 | 238 | ||
229 | if ( d->parentWidget() && !d->parentWidget()->topLevelWidget()->isMaximized() ) | 239 | if ( d->parentWidget() && !d->parentWidget()->topLevelWidget()->isMaximized() ) |
230 | nomax = TRUE; | 240 | nomax = TRUE; |
231 | 241 | ||
232 | #ifndef Q_WS_QWS | 242 | #ifndef Q_WS_QWS |
233 | QSize s(qApp->desktop()->width(), qApp->desktop()->height() ); | 243 | QSize s(qApp->desktop()->width(), qApp->desktop()->height() ); |
234 | #else | 244 | #else |
235 | QSize s(qt_maxWindowRect.width(), qt_maxWindowRect.height() ); | 245 | QSize s(qt_maxWindowRect.width(), qt_maxWindowRect.height() ); |
236 | #endif | 246 | #endif |
237 | 247 | ||
238 | int maxX = s.width() - (d->frameGeometry().width() - d->geometry().width()); | 248 | int maxX = s.width() - (d->frameGeometry().width() - d->geometry().width()); |
239 | int maxY = s.height() - (d->frameGeometry().height() - d->geometry().height()); | 249 | int maxY = s.height() - (d->frameGeometry().height() - d->geometry().height()); |
240 | 250 | ||
241 | if ( (w >= maxX && h >= maxY) || ( (!nomax) && ( w > s.width()*3/4 || h > s.height()*3/4 ) ) ) { | 251 | if ( (w >= maxX && h >= maxY) || ( (!nomax) && ( w > s.width()*3/4 || h > s.height()*3/4 ) ) ) { |