User: hr Date: 2007-08-02 14:26:05+0000 Modified: dba/dbaccess/source/ui/app/AppDetailView.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.23.4); FILE MERGED 2007/07/16 07:10:56 lla 1.23.4.1: #i77897# helptext little bit smaller File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.23&r2=1.24 Delta lines: +19 -3 -------------------- --- AppDetailView.cxx 2007-07-06 07:59:01+0000 1.23 +++ AppDetailView.cxx 2007-08-02 14:26:03+0000 1.24 @@ -480,10 +480,21 @@ { DBG_CHKTHIS(OTasksWindow,NULL); if ( _nId ) - m_aHelpText.SetText(ModuleRes(_nId)); + { + String sText = ModuleRes(_nId); + + // calulate the size of the text field + // Size aHelpTextSize = m_aHelpText.GetSizePixel(); + // Size aHelpTextPixelSize = LogicToPixel( aHelpTextSize, MAP_APPFONT ); + // Rectangle aPrimaryRect( Point(0,0), aHelpTextSize ); + // Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sText, TEXT_DRAW_MULTILINE | TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK ) ); + m_aHelpText.SetText(sText); + } else + { m_aHelpText.SetText(String()); } +} // ----------------------------------------------------------------------------- IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/) { @@ -508,9 +519,14 @@ long nHalfOutputWidth = static_cast<long>(nOutputWidth * 0.5); m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) ); - m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nOutputWidth - nHalfOutputWidth - aFLSize.Width(), nOutputHeight) ); + // i77897 make the m_aHelpText a little bit smaller. (-5) + sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5; + // m_aHelpText.SetBackground( MAKE_SALCOLOR( 0xe0, 0xe0, 0xe0 ) ); + // Wallpaper aLightGray(Color(0xe0, 0xe0, 0xe0)); + // m_aHelpText.SetBackground( aLightGray ); + m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) ); Size aDesc = m_aDescription.CalcMinimumSize(); - m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nOutputWidth - nHalfOutputWidth - aFLSize.Width(), nOutputHeight - aDesc.Height() - n6PPT) ); + m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) ); m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
