diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:13:02 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:13:02 +0000 |
| commit | aaf196047cc91f543c69fc561ea0ec10a80a5002 (patch) | |
| tree | 7b040d3a5f2b8be5d2861d719f42019b01be16be | |
| parent | 23a8d4cb8c763bd0ea6fd77be6e5e841fa1bd1b4 (diff) | |
INTEGRATION: CWS os30 (1.33.12); FILE MERGED
2004/06/01 06:58:55 pb 1.33.12.1: fix: #115068# now all text and selection are visible in high contrast
| -rw-r--r-- | svtools/source/contnr/svtreebx.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index b0849356e5b6..c62070c58cac 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svtreebx.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: rt $ $Date: 2004-06-16 10:11:03 $ + * last change: $Author: rt $ $Date: 2004-06-17 16:13:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1658,19 +1658,17 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags, { if( !bInUse || nItemType != SV_ITEM_ID_LBOXCONTEXTBMP ) { - if( bHideSelection ) + // if the face color is bright then the deactive color is also bright + // -> so you can't see any deactive selection + if( bHideSelection && !rSettings.GetFaceColor().IsBright() ) aWallpaper.SetColor( rSettings.GetDeactiveColor() ); else aWallpaper.SetColor( rSettings.GetHighlightColor() ); // set font color to highlight if( !bCurFontIsSel && nItemType == SV_ITEM_ID_LBOXSTRING ) { - // don't paint white on white (pb: #i16031#) - if ( aWallpaper.GetColor().IsBright() != aHiliteFont.GetColor().IsBright() ) - { - Control::SetFont( aHiliteFont ); - bCurFontIsSel = TRUE; - } + Control::SetFont( aHiliteFont ); + bCurFontIsSel = TRUE; } } else // ContextBitmap + InUse-Emphasis + Selektiert @@ -2475,6 +2473,7 @@ void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground) { Font aFont; aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); SetPointFont( aFont ); AdjustEntryHeight( aFont ); RecalcViewData(); |