From 3499614131ef6499c7e9a1ac1acec130f7c6dd42 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 1 Dec 2003 09:01:37 +0000 Subject: INTEGRATION: CWS geordi2q10 (1.17.166); FILE MERGED 2003/11/27 11:04:18 rt 1.17.166.1: #111934#: join CWS os22 --- svtools/source/contnr/imivctl1.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'svtools/source/contnr/imivctl1.cxx') diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index c84ebe6e87bb..a224696ec88d 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imivctl1.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: vg $ $Date: 2003-05-27 11:23:02 $ + * last change: $Author: rt $ $Date: 2003-12-01 10:01:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -301,7 +301,7 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle ) if( nWinBits & WB_NOSELECTION ) eSelectionMode = NO_SELECTION; if( !(nWinStyle & (WB_ALIGN_TOP | WB_ALIGN_LEFT))) - nWinStyle |= WB_ALIGN_TOP; + nWinBits |= WB_ALIGN_LEFT; if( (nWinStyle & WB_DETAILS)) { if( !pColumns ) @@ -3186,13 +3186,14 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry Rectangle aBmpRect( CalcBmpRect( pEntry ) ); Rectangle aTextRect( CalcTextRect( pEntry ) ); Rectangle aBoundRect( GetEntryBoundRect( pEntry ) ); - Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 2, - aBoundRect.Right() - 4, aTextRect.Bottom() + 4 ); + Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 1, + aBoundRect.Right() - 4, aTextRect.Bottom() + 1 ); // Das Fokusrechteck soll nicht den Text beruehren if( aFocusRect.Left() - 1 >= pEntry->aRect.Left() ) aFocusRect.Left()--; if( aFocusRect.Right() + 1 <= pEntry->aRect.Right() ) aFocusRect.Right()++; + return aFocusRect; } -- cgit