diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-07 01:32:24 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-07 01:32:24 -0500 |
| commit | 74dac1c21d3ad1f446874fd29f7e670e77a196b5 (patch) | |
| tree | 8ff20c2c06d337cdcec36a32afc8bfd9f4120064 /src/widgets | |
| parent | c73edd8f63289c619c20a8e5d031a24d870c62ee (diff) | |
| download | tqt3-74dac1c21d3ad1f446874fd29f7e670e77a196b5.tar.gz tqt3-74dac1c21d3ad1f446874fd29f7e670e77a196b5.zip | |
Automated update from Qt3
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/qgroupbox.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/qlabel.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/qtoolbox.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp index d78ae735f..39f43a470 100644 --- a/src/widgets/qgroupbox.cpp +++ b/src/widgets/qgroupbox.cpp @@ -364,8 +364,9 @@ void TQGroupBox::paintEvent( TQPaintEvent *event ) if(va & AlignTop) r.moveBy(0, fm.descent()); TQColor pen( (TQRgb) style().styleHint(TQStyle::SH_GroupBox_TextLabelColor, this ) ); - if (!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) + if ((!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(TQStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown()))) { va |= NoAccel; + } style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), isEnabled(), 0, str, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( event->region().subtract( r ) ); // clip everything but title diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp index c78b99104..314bfe219 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -838,8 +838,9 @@ void TQLabel::drawContents( TQPainter *p ) } #endif int alignment = align; - if ((align & ShowPrefix) && !style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) + if ((align & ShowPrefix) && ((!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(TQStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown())))) { alignment |= NoAccel; + } // ordinary text or pixmap label style().drawItem( p, cr, alignment, colorGroup(), isEnabled(), pix, ltext ); diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index 74f1e6046..d1c30012c 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -240,8 +240,9 @@ void TQToolBoxButton::drawButton( TQPainter *p ) fill = &cg.color( TQPalette::foregroundRoleFromMode( tb->backgroundMode() ) ); int alignment = AlignLeft | AlignVCenter | ShowPrefix; - if (!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) + if ((!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(TQStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown()))) { alignment |= NoAccel; + } style().drawItem( p, tr, alignment, cg, isEnabled(), 0, txt, -1, fill ); |