-rw-r--r-- | library/qpedecoration_qws.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index fa38180..fb47c14 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -264,127 +264,127 @@ void QPEManager::drawButton( QWidget *w, QPEDecoration::QPERegion r, int state ) | |||
264 | painter.internalGfx()->setWidgetDeviceRegion( rgn ); | 264 | painter.internalGfx()->setWidgetDeviceRegion( rgn ); |
265 | painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All)); | 265 | painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All)); |
266 | decoration->paintButton( &painter, w, (QWSDecoration::Region)r, state ); | 266 | decoration->paintButton( &painter, w, (QWSDecoration::Region)r, state ); |
267 | } | 267 | } |
268 | 268 | ||
269 | void QPEManager::drawTitle( QWidget *w ) | 269 | void QPEManager::drawTitle( QWidget *w ) |
270 | { | 270 | { |
271 | QPainter painter(w); | 271 | QPainter painter(w); |
272 | QRegion rgn = ((TLWidget *)w)->topExtra()->decor_allocated_region; | 272 | QRegion rgn = ((TLWidget *)w)->topExtra()->decor_allocated_region; |
273 | painter.internalGfx()->setWidgetDeviceRegion( rgn ); | 273 | painter.internalGfx()->setWidgetDeviceRegion( rgn ); |
274 | painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All)); | 274 | painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All)); |
275 | decoration->paint( &painter, w ); | 275 | decoration->paint( &painter, w ); |
276 | decoration->paintButton(&painter, w, QWSDecoration::Menu, 0); | 276 | decoration->paintButton(&painter, w, QWSDecoration::Menu, 0); |
277 | decoration->paintButton(&painter, w, QWSDecoration::Close, 0); | 277 | decoration->paintButton(&painter, w, QWSDecoration::Close, 0); |
278 | decoration->paintButton(&painter, w, QWSDecoration::Minimize, 0); | 278 | decoration->paintButton(&painter, w, QWSDecoration::Minimize, 0); |
279 | decoration->paintButton(&painter, w, QWSDecoration::Maximize, 0); | 279 | decoration->paintButton(&painter, w, QWSDecoration::Maximize, 0); |
280 | } | 280 | } |
281 | 281 | ||
282 | void QPEManager::whatsThisTimeout() | 282 | void QPEManager::whatsThisTimeout() |
283 | { | 283 | { |
284 | if ( !QWhatsThis::inWhatsThisMode() ) { | 284 | if ( !QWhatsThis::inWhatsThisMode() ) { |
285 | if ( inWhatsThis ) { | 285 | if ( inWhatsThis ) { |
286 | if ( whatsThis ) { | 286 | if ( whatsThis ) { |
287 | QWidget *w = whatsThis; | 287 | QWidget *w = whatsThis; |
288 | whatsThis = 0; | 288 | whatsThis = 0; |
289 | drawTitle( w ); | 289 | drawTitle( w ); |
290 | } | 290 | } |
291 | wtTimer->stop(); | 291 | wtTimer->stop(); |
292 | } else { | 292 | } else { |
293 | QWhatsThis::enterWhatsThisMode(); | 293 | QWhatsThis::enterWhatsThisMode(); |
294 | helpState = 0; | 294 | helpState = 0; |
295 | updateActive(); | 295 | updateActive(); |
296 | if ( active ) { | 296 | if ( active ) { |
297 | whatsThis = active; | 297 | whatsThis = active; |
298 | drawTitle( active ); | 298 | drawTitle( active ); |
299 | // check periodically to see if we've left whats this mode | 299 | // check periodically to see if we've left whats this mode |
300 | wtTimer->start( 250 ); | 300 | wtTimer->start( 250 ); |
301 | } | 301 | } |
302 | } | 302 | } |
303 | inWhatsThis = !inWhatsThis; | 303 | inWhatsThis = !inWhatsThis; |
304 | } | 304 | } |
305 | } | 305 | } |
306 | 306 | ||
307 | //=========================================================================== | 307 | //=========================================================================== |
308 | 308 | ||
309 | static QImage *okImage( int th ) | 309 | static QImage *okImage( int th ) |
310 | { | 310 | { |
311 | static QImage *i = 0; | 311 | static QImage *i = 0; |
312 | if ( !i || i->height() != th ) { | 312 | if ( !i || ::abs( i->height()-th ) > 4 ) { |
313 | delete i; | 313 | delete i; |
314 | i = new QImage(scaleButton(Resource::loadImage("OKButton"),th)); | 314 | i = new QImage(scaleButton(Resource::loadImage("OKButton"),th)); |
315 | } | 315 | } |
316 | return i; | 316 | return i; |
317 | } | 317 | } |
318 | 318 | ||
319 | static QImage *closeImage( int th ) | 319 | static QImage *closeImage( int th ) |
320 | { | 320 | { |
321 | static QImage *i = 0; | 321 | static QImage *i = 0; |
322 | if ( !i || i->height() != th ) { | 322 | if ( !i || ::abs( i->height()-th ) > 4 ) { |
323 | delete i; | 323 | delete i; |
324 | i = new QImage(scaleButton(Resource::loadImage("CloseButton"),th)); | 324 | i = new QImage(scaleButton(Resource::loadImage("CloseButton"),th)); |
325 | } | 325 | } |
326 | return i; | 326 | return i; |
327 | } | 327 | } |
328 | 328 | ||
329 | static QImage *helpImage( int th ) | 329 | static QImage *helpImage( int th ) |
330 | { | 330 | { |
331 | static QImage *i = 0; | 331 | static QImage *i = 0; |
332 | if ( !i || i->height() != th ) { | 332 | if ( !i || ::abs( i->height()-th ) > 4 ) { |
333 | delete i; | 333 | delete i; |
334 | i = new QImage(scaleButton(Resource::loadImage("HelpButton"),th)); | 334 | i = new QImage(scaleButton(Resource::loadImage("HelpButton"),th)); |
335 | } | 335 | } |
336 | return i; | 336 | return i; |
337 | } | 337 | } |
338 | 338 | ||
339 | static QImage *maximizeImage( int th ) | 339 | static QImage *maximizeImage( int th ) |
340 | { | 340 | { |
341 | static QImage *i = 0; | 341 | static QImage *i = 0; |
342 | if ( !i || i->height() != th ) { | 342 | if ( !i || ::abs( i->height()-th ) > 4 ) { |
343 | delete i; | 343 | delete i; |
344 | i = new QImage(scaleButton(Resource::loadImage("MaximizeButton"),th)); | 344 | i = new QImage(scaleButton(Resource::loadImage("MaximizeButton"),th)); |
345 | } | 345 | } |
346 | return i; | 346 | return i; |
347 | } | 347 | } |
348 | 348 | ||
349 | int WindowDecorationInterface::metric( Metric m, const WindowData *wd ) const | 349 | int WindowDecorationInterface::metric( Metric m, const WindowData *wd ) const |
350 | { | 350 | { |
351 | switch ( m ) { | 351 | switch ( m ) { |
352 | case TitleHeight: | 352 | case TitleHeight: |
353 | if ( QApplication::desktop()->height() > 320 ) | 353 | if ( QApplication::desktop()->height() > 320 ) |
354 | return 19; | 354 | return 19; |
355 | else | 355 | else |
356 | return 15; | 356 | return 15; |
357 | case LeftBorder: | 357 | case LeftBorder: |
358 | case RightBorder: | 358 | case RightBorder: |
359 | case TopBorder: | 359 | case TopBorder: |
360 | case BottomBorder: | 360 | case BottomBorder: |
361 | return 4; | 361 | return 4; |
362 | case OKWidth: | 362 | case OKWidth: |
363 | return okImage(metric(TitleHeight,wd))->width(); | 363 | return okImage(metric(TitleHeight,wd))->width(); |
364 | case CloseWidth: | 364 | case CloseWidth: |
365 | return closeImage(metric(TitleHeight,wd))->width(); | 365 | return closeImage(metric(TitleHeight,wd))->width(); |
366 | case HelpWidth: | 366 | case HelpWidth: |
367 | return helpImage(metric(TitleHeight,wd))->width(); | 367 | return helpImage(metric(TitleHeight,wd))->width(); |
368 | case MaximizeWidth: | 368 | case MaximizeWidth: |
369 | return maximizeImage(metric(TitleHeight,wd))->width(); | 369 | return maximizeImage(metric(TitleHeight,wd))->width(); |
370 | case CornerGrabSize: | 370 | case CornerGrabSize: |
371 | return 16; | 371 | return 16; |
372 | } | 372 | } |
373 | 373 | ||
374 | return 0; | 374 | return 0; |
375 | } | 375 | } |
376 | 376 | ||
377 | void WindowDecorationInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const | 377 | void WindowDecorationInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const |
378 | { | 378 | { |
379 | int th = metric( TitleHeight, wd ); | 379 | int th = metric( TitleHeight, wd ); |
380 | QRect r = wd->rect; | 380 | QRect r = wd->rect; |
381 | 381 | ||
382 | switch ( a ) { | 382 | switch ( a ) { |
383 | case Border: | 383 | case Border: |
384 | { | 384 | { |
385 | const QColorGroup &cg = wd->palette.active(); | 385 | const QColorGroup &cg = wd->palette.active(); |
386 | qDrawWinPanel(p, r.x()-metric(LeftBorder,wd), | 386 | qDrawWinPanel(p, r.x()-metric(LeftBorder,wd), |
387 | r.y()-th-metric(TopBorder,wd), | 387 | r.y()-th-metric(TopBorder,wd), |
388 | r.width()+metric(LeftBorder,wd)+metric(RightBorder,wd), | 388 | r.width()+metric(LeftBorder,wd)+metric(RightBorder,wd), |
389 | r.height()+th+metric(TopBorder,wd)+metric(BottomBorder,wd), | 389 | r.height()+th+metric(TopBorder,wd)+metric(BottomBorder,wd), |
390 | cg, FALSE, &cg.brush(QColorGroup::Background)); | 390 | cg, FALSE, &cg.brush(QColorGroup::Background)); |