Diffstat (limited to 'noncore/styles/phase/phasestyle.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/styles/phase/phasestyle.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp index ba8c460..906ccee 100644 --- a/noncore/styles/phase/phasestyle.cpp +++ b/noncore/styles/phase/phasestyle.cpp | |||
@@ -315,12 +315,17 @@ void PhaseStyle::polish( QWidget* widget ) { | |||
315 | // else if (widget->inherits("QFrame") ) { | 315 | // else if (widget->inherits("QFrame") ) { |
316 | // widget->installEventFilter(this); | 316 | // widget->installEventFilter(this); |
317 | // } | 317 | // } |
318 | #endif | 318 | #endif |
319 | } | 319 | } |
320 | 320 | ||
321 | void PhaseStyle::unPolish( QWidget *w ) | ||
322 | { | ||
323 | QWindowsStyle::unPolish( w ); | ||
324 | } | ||
325 | |||
321 | void PhaseStyle::polish( QPalette &pal ) { | 326 | void PhaseStyle::polish( QPalette &pal ) { |
322 | QWindowsStyle::polish( pal ); | 327 | QWindowsStyle::polish( pal ); |
323 | // lighten up a bit, so the look is not so "crisp" | 328 | // lighten up a bit, so the look is not so "crisp" |
324 | if (QPixmap::defaultDepth() > 8) { // but not on low color displays | 329 | if (QPixmap::defaultDepth() > 8) { // but not on low color displays |
325 | pal.setColor(QPalette::Disabled, QColorGroup::Dark, | 330 | pal.setColor(QPalette::Disabled, QColorGroup::Dark, |
326 | pal.color(QPalette::Disabled, QColorGroup::Dark).light(contrast)); | 331 | pal.color(QPalette::Disabled, QColorGroup::Dark).light(contrast)); |
@@ -334,12 +339,17 @@ void PhaseStyle::polish( QPalette &pal ) { | |||
334 | void PhaseStyle::polish( QApplication* app ) { | 339 | void PhaseStyle::polish( QApplication* app ) { |
335 | QWindowsStyle::polish( app ); | 340 | QWindowsStyle::polish( app ); |
336 | 341 | ||
337 | qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl)&PhaseStyle::drawMenuBarItem); | 342 | qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl)&PhaseStyle::drawMenuBarItem); |
338 | } | 343 | } |
339 | 344 | ||
345 | void PhaseStyle::unPolish( QApplication* app ) { | ||
346 | QWindowsStyle::unPolish(app); | ||
347 | qt_set_draw_menu_bar_impl ( 0 ); | ||
348 | } | ||
349 | |||
340 | void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) { | 350 | void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) { |
341 | bool active = button->isOn() || button->isDown(); | 351 | bool active = button->isOn() || button->isDown(); |
342 | QRect r = pushButtonContentsRect( button ); | 352 | QRect r = pushButtonContentsRect( button ); |
343 | QColorGroup group = button->colorGroup(); | 353 | QColorGroup group = button->colorGroup(); |
344 | int x, y, w, h; | 354 | int x, y, w, h; |
345 | r.rect( &x, &y, &w, &h ); | 355 | r.rect( &x, &y, &w, &h ); |
@@ -628,21 +638,21 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable, | |||
628 | p->fillRect(x, y, w, h, g.highlight() ); | 638 | p->fillRect(x, y, w, h, g.highlight() ); |
629 | else | 639 | else |
630 | p->fillRect(x, y, w, h, g.background() ); | 640 | p->fillRect(x, y, w, h, g.background() ); |
631 | 641 | ||
632 | // draw seperator | 642 | // draw seperator |
633 | if (mi->isSeparator() ) { | 643 | if (mi->isSeparator() ) { |
634 | p->setPen( g.dark() ); | 644 | p->setPen( g.dark() ); |
635 | p->drawLine( x+8, y+1, x+w-8, y+1 ); | 645 | p->drawLine( x+8, y+1, x+w-8, y+1 ); |
636 | 646 | ||
637 | p->setPen( g.mid() ); | 647 | p->setPen( g.mid() ); |
638 | p->drawLine( x+8, y, x+w-8, y ); | 648 | p->drawLine( x+8, y, x+w-8, y ); |
639 | p->drawPoint(x+w,y+1); | 649 | p->drawPoint(x+w,y+1); |
640 | 650 | ||
641 | p->setPen( g.midlight() ); | 651 | p->setPen( g.midlight() ); |
642 | p->drawLine( x+8, y-1, x+w-8, y-1 ); | 652 | p->drawLine( x+8, y-1, x+w-8, y-1 ); |
643 | p->drawPoint(x+8, y ); | 653 | p->drawPoint(x+8, y ); |
644 | return; | 654 | return; |
645 | } | 655 | } |
646 | 656 | ||
647 | // draw icon | 657 | // draw icon |
648 | QIconSet::Mode mode; | 658 | QIconSet::Mode mode; |
@@ -773,15 +783,15 @@ void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab, | |||
773 | 783 | ||
774 | 784 | ||
775 | painter->save(); | 785 | painter->save(); |
776 | 786 | ||
777 | // what position is the tab? | 787 | // what position is the tab? |
778 | if ((bar->count() == 1 )) | 788 | if ((bar->count() == 1 )) |
779 | edge = true; | 789 | edge = true; |
780 | else | 790 | else |
781 | edge = false; | 791 | edge = false; |
782 | 792 | ||
783 | switch (QTabBar::Shape(bar->shape())) { | 793 | switch (QTabBar::Shape(bar->shape())) { |
784 | case QTabBar::RoundedAbove: | 794 | case QTabBar::RoundedAbove: |
785 | case QTabBar::TriangularAbove: { | 795 | case QTabBar::TriangularAbove: { |
786 | if (!selected) { // shorten | 796 | if (!selected) { // shorten |
787 | y += 2; h -= 2; | 797 | y += 2; h -= 2; |