diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:12:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:12:37 +0000 |
| commit | 3561c4d74a77517b0c83f575a56d3f963d0a7dad (patch) | |
| tree | a61b8fb325e2bbb29ae44fc1f522e5783c8177b9 /svtools/source/contnr/imivctl1.cxx | |
| parent | 649fce50d6c1b1868efe4342be5057571a3cc60e (diff) | |
INTEGRATION: CWS os30 (1.19.80); FILE MERGED
2004/06/01 06:58:54 pb 1.19.80.1: fix: #115068# now all text and selection are visible in high contrast
Diffstat (limited to 'svtools/source/contnr/imivctl1.cxx')
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 7b1eebaecd1f..306c82e1fc0e 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imivctl1.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: vg $ $Date: 2004-01-06 19:22:21 $ + * last change: $Author: rt $ $Date: 2004-06-17 16:12:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2032,7 +2032,6 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P { const StyleSettings& rSettings = pOut->GetSettings().GetStyleSettings(); Font aNewFont( aTempFont ); - aNewFont.SetColor( bActiveSelection ? rSettings.GetHighlightTextColor() : rSettings.GetWindowTextColor() ); // bei hart attributierter Font-Fuellcolor muessen wir diese // hart auf die Highlight-Color setzen @@ -2043,6 +2042,13 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P else aNewFont.SetFillColor( rSettings.GetDeactiveColor() ); } + + Color aWinCol = rSettings.GetWindowTextColor(); + if ( !bActiveSelection && rSettings.GetFaceColor().IsBright() == aWinCol.IsBright() ) + aNewFont.SetColor( rSettings.GetWindowTextColor() ); + else + aNewFont.SetColor( rSettings.GetHighlightTextColor() ); + pOut->SetFont( aNewFont ); pOut->SetFillColor( pOut->GetBackground().GetColor() ); @@ -4136,9 +4142,7 @@ void SvxIconChoiceCtrl_Impl::InitSettings() Font aFont( rStyleSettings.GetFieldFont() ); const Font& rFont = pView->GetFont(); if( pView->HasFontTextColor() ) - { - aFont.SetColor( rFont.GetColor() ); - } + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); if( pView->HasFontFillColor() ) aFont.SetFillColor( rFont.GetFillColor() ); pView->SetPointFont( aFont ); |