User: vg Date: 2008-08-19 10:16:41+0000 Modified: dba/reportdesign/source/ui/report/EndMarker.cxx
Log: INTEGRATION: CWS dba31a (1.4.30); FILE MERGED 2008/06/26 14:26:34 oj 1.4.30.2: #i77916# impl zooming in report builder 2008/06/13 11:40:20 oj 1.4.30.1: #i88506# impl hyphenation File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: EndMarker.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/EndMarker.cxx?r1=1.4&r2=1.5 Delta lines: +15 -15 --------------------- --- EndMarker.cxx 2008-04-10 19:13:44+0000 1.4 +++ EndMarker.cxx 2008-08-19 10:16:39+0000 1.5 @@ -30,10 +30,8 @@ #include "precompiled_reportdesign.hxx" #include "EndMarker.hxx" #include "ColorChanger.hxx" -#include "ViewsWindow.hxx" -#ifndef RTPUI_REPORTDESIGN_HELPID_HRC +#include "SectionWindow.hxx" #include "helpids.hrc" -#endif #include <vcl/svapp.hxx> #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> @@ -51,6 +49,7 @@ DBG_CTOR( rpt_OEndMarker,NULL); SetUniqueId(HID_RPT_ENDMARKER); ImplInitSettings(); + SetPaintTransparent(TRUE); } // ----------------------------------------------------------------------------- OEndMarker::~OEndMarker() @@ -60,11 +59,15 @@ // ----------------------------------------------------------------------------- void OEndMarker::Paint( const Rectangle& /*rRect*/ ) { + Fraction aCornerSpace(long(CORNER_SPACE)); + aCornerSpace *= GetMapMode().GetScaleX(); + const long nCornerSpace = aCornerSpace; + Size aSize = GetSizePixel(); - aSize.Width() += CORNER_SPACE; - Rectangle aWholeRect(Point(-CORNER_SPACE,0),aSize); + aSize.Width() += nCornerSpace; + Rectangle aWholeRect(Point(-nCornerSpace,0),aSize); PolyPolygon aPoly; - aPoly.Insert(Polygon(aWholeRect,CORNER_SPACE,CORNER_SPACE)); + aPoly.Insert(Polygon(aWholeRect,nCornerSpace,nCornerSpace)); Color aStartColor(m_nColor); aStartColor.IncreaseLuminance(10); @@ -77,30 +80,27 @@ Gradient aGradient(GRADIENT_LINEAR,aStartColor,aEndColor); aGradient.SetSteps(static_cast<USHORT>(aSize.Height())); - DrawGradient(aPoly ,aGradient); + DrawGradient(PixelToLogic(aPoly) ,aGradient); if ( m_bMarked ) { - Rectangle aRect( Point(-CORNER_SPACE,CORNER_SPACE), - Size(aSize.Width()- CORNER_SPACE,aSize.Height() - CORNER_SPACE- CORNER_SPACE)); + Rectangle aRect( Point(-nCornerSpace,nCornerSpace), + Size(aSize.Width()- nCornerSpace,aSize.Height() - nCornerSpace- nCornerSpace)); ColorChanger aColors( this, COL_WHITE, COL_WHITE ); - DrawPolyLine(Polygon(aRect),LineInfo(LINE_SOLID,2)); + DrawPolyLine(Polygon(PixelToLogic(aRect)),LineInfo(LINE_SOLID,2)); } } // ----------------------------------------------------------------------- void OEndMarker::ImplInitSettings() { - //SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); - /*SetBackground( );*/ - SetBackground( Wallpaper( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor ) ); + SetBackground( Wallpaper( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); - //SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDarkShadowColor() ); } // ----------------------------------------------------------------------- void OEndMarker::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() && !rMEvt.IsRight()) return; - static_cast<OViewsWindow*>(GetParent())->showProperties(this); + static_cast<OSectionWindow*>(GetParent())->showProperties(); } // ======================================================================= } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
