diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-08 15:38:47 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-08 15:38:47 -0500 |
| commit | 785106b36c47923c338b6d3d61584eea448863ca (patch) | |
| tree | 6b2bbbde4a5ff5e43c1c9ec31ad0bd72ea43e0df /src/widgets/qgroupbox.cpp | |
| parent | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (diff) | |
| parent | 43db215f601fd50f1fd8b502fae30c75c1bdee4a (diff) | |
| download | tqt3-785106b36c47923c338b6d3d61584eea448863ca.tar.gz tqt3-785106b36c47923c338b6d3d61584eea448863ca.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/qgroupbox.cpp')
| -rw-r--r-- | src/widgets/qgroupbox.cpp | 3 |
1 files changed, 2 insertions, 1 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 |