Tag: cws_src680_dba32 User: oj Date: 05/04/06 06:20:54 Modified: /dba/dbaccess/source/ui/app/ AppIconControl.cxx, AppSwapWindow.cxx, AppTitleWindow.cxx, AppView.cxx
Log: #i46798\ change size of title window and center icons File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppIconControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppIconControl.cxx?r1=1.4&r2=1.4.62.1 Delta lines: +4 -4 ------------------- --- AppIconControl.cxx 21 Jan 2005 17:07:42 -0000 1.4 +++ AppIconControl.cxx 6 Apr 2005 13:20:50 -0000 1.4.62.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppIconControl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.62.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:07:42 $ + * last change: $Author: oj $ $Date: 2005/04/06 13:20:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ //================================================================== OApplicationIconControl::OApplicationIconControl(Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ - WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL) + WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) ,m_pActionListener(NULL) { File [changed]: AppSwapWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppSwapWindow.cxx?r1=1.3&r2=1.3.96.1 Delta lines: +12 -12 --------------------- --- AppSwapWindow.cxx 22 Oct 2004 12:01:05 -0000 1.3 +++ AppSwapWindow.cxx 6 Apr 2005 13:20:50 -0000 1.3.96.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppSwapWindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.96.1 $ * - * last change: $Author: pjunck $ $Date: 2004/10/22 12:01:05 $ + * last change: $Author: oj $ $Date: 2005/04/06 13:20:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,8 +123,14 @@ // ----------------------------------------------------------------------------- void OApplicationSwapWindow::Resize() { - m_aIconControl.SetPosSizePixel( Point(0, 0 ), - GetOutputSize() ); + Size aFLSize = LogicToPixel( Size( 8, 0 ), MAP_APPFONT ); + long nX = 0; + if ( m_aIconControl.GetEntryCount() != 0 ) + nX = m_aIconControl.GetBoundingBox( m_aIconControl.GetEntry(0) ).GetWidth() + aFLSize.Width(); + + Size aOutputSize = GetOutputSize(); + + m_aIconControl.SetPosSizePixel( Point(static_cast<long>((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); m_aIconControl.ArrangeIcons(); } // ----------------------------------------------------------------------------- @@ -148,13 +154,7 @@ SetTextColor( aTextColor ); } - if ( bBackground ) - { - if( IsControlBackground() ) - SetBackground( GetControlBackground() ); - else - SetBackground( rStyleSettings.GetFaceColor() ); - } + SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetWindowColor() ) ); } // ----------------------------------------------------------------------- void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt ) File [changed]: AppTitleWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppTitleWindow.cxx?r1=1.3&r2=1.3.114.1 Delta lines: +5 -4 ------------------- --- AppTitleWindow.cxx 9 Sep 2004 09:39:59 -0000 1.3 +++ AppTitleWindow.cxx 6 Apr 2005 13:20:51 -0000 1.3.114.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppTitleWindow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.114.1 $ * - * last change: $Author: rt $ $Date: 2004/09/09 09:39:59 $ + * last change: $Author: oj $ $Date: 2005/04/06 13:20:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,7 +149,8 @@ // ----------------------------------------------------------------------------- long OTitleWindow::GetWidthPixel() const { - sal_Int32 nWidth = GetTextWidth(m_aTitle.GetText()); + Size aTextSize = LogicToPixel( Size( 12, 0 ), MAP_APPFONT ); + sal_Int32 nWidth = GetTextWidth(m_aTitle.GetText()) + 2*aTextSize.Width(); return nWidth; } File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.8&r2=1.8.62.1 Delta lines: +4 -4 ------------------- --- AppView.cxx 21 Jan 2005 17:08:01 -0000 1.8 +++ AppView.cxx 6 Apr 2005 13:20:51 -0000 1.8.62.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppView.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.62.1 $ * - * last change: $Author: kz $ $Date: 2005/01/21 17:08:01 $ + * last change: $Author: oj $ $Date: 2005/04/06 13:20:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -224,7 +224,7 @@ if ( pSwap->GetEntryCount() != 0 ) nX = pSwap->GetBoundingBox( pSwap->GetEntry(0) ).GetWidth() + aFLSize.Height(); } - nX = ::std::max(m_pPanel->GetWidthPixel(),nX); + nX = ::std::max(m_pPanel->GetWidthPixel() ,nX); m_pPanel->SetPosSizePixel(Point(0,0),Size(nX,nOutputHeight)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
