diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-12 14:09:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-12 21:16:59 +0100 |
| commit | de0c542cd221ca2b189323fa7ce84b6cf55d2fd2 (patch) | |
| tree | e7324e9dd58d71133e58177334ff649aeed0bd56 | |
| parent | b2cd9dd31183c45942c2f522104654ff1f8e6889 (diff) | |
tdf#114407 let tooltip children of non-nwf widgets be nwf themed
alternative is to not use themed text color when writing text
in non-nwf tooltips
Change-Id: I12556d5fd9a38c4b36f77c97144898f08fa4d738
Reviewed-on: https://gerrit.libreoffice.org/46312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/window.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index fecc5530202c..f2a9d47e16b5 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2248,7 +2248,8 @@ void Window::Show(bool bVisible, ShowFlags nFlags) // required here, because frames never show up in the child hierarchy - which should be fixed.... // eg, the drop down of a combobox which is a system floating window if( mpWindowImpl->mbFrame && GetParent() && GetParent()->IsCompoundControl() && - GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() ) + GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() && + !(GetStyle() & WB_TOOLTIPWIN) ) { EnableNativeWidget( GetParent()->IsNativeWidgetEnabled() ); } |