diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-12-13 10:08:34 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-12-13 15:45:54 +0100 |
| commit | e4e8f246452da4a81ffd92664c9731e0e195b032 (patch) | |
| tree | ec81e4ec3e5a12e1534ddc2f8ba69ee6b406b5f5 /sfx2/source/control/templateview.cxx | |
| parent | f82b7a2aea7bcbc6dca13fc251b11685d62b8380 (diff) | |
Revert "Template Manager: better show the folder overlay."
This reverts commit 7bebd970852a34c8421b499d06d75444c08221bc.
Diffstat (limited to 'sfx2/source/control/templateview.cxx')
| -rw-r--r-- | sfx2/source/control/templateview.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/sfx2/source/control/templateview.cxx b/sfx2/source/control/templateview.cxx index ce3100314b41..23f10956b912 100644 --- a/sfx2/source/control/templateview.cxx +++ b/sfx2/source/control/templateview.cxx @@ -11,8 +11,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/vector/b2dvector.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> @@ -20,11 +18,9 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/processor2d/baseprocessor2d.hxx> -#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/templateviewitem.hxx> #include <vcl/edit.hxx> -#include <vcl/scrbar.hxx> #include "templateview.hrc" @@ -43,7 +39,6 @@ TemplateView::TemplateView (Window *pParent) mpEditName(new Edit(this, WB_BORDER | WB_HIDE)) { mnHeaderHeight = 30; - mnFooterHeight = 5; } TemplateView::~TemplateView () @@ -62,7 +57,7 @@ void TemplateView::Paint (const Rectangle &rRect) ThumbnailView::Paint(rRect); int nCount = 0; - int nMaxCount = 2; + int nMaxCount = 1; if (mbRenderTitle) ++nMaxCount; @@ -83,14 +78,11 @@ void TemplateView::Paint (const Rectangle &rRect) mpItemAttrs->aFontSize.getX(), mpItemAttrs->aFontSize.getY(), double( aPos.X() ), double( aPos.Y() ) ) ); - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - B2DVector aFontSize; - FontAttribute aFontAttr = getFontAttributeFromVclFont(aFontSize, rStyleSettings.GetTitleFont(), false, false); aSeq[nCount++] = Primitive2DReference( new TextSimplePortionPrimitive2D(aTextMatrix, maName,0,maName.getLength(), std::vector< double >( ), - aFontAttr, + mpItemAttrs->aFontAttr, com::sun::star::lang::Locale(), Color(COL_BLACK).getBColor() ) ); } @@ -101,7 +93,7 @@ void TemplateView::Paint (const Rectangle &rRect) aPos.Y() = (mnHeaderHeight - aImageSize.Height())/2; aPos.X() = aWinSize.Width() - aImageSize.Width() - aPos.Y(); - aSeq[nCount++] = Primitive2DReference( new FillBitmapPrimitive2D( + aSeq[nCount] = Primitive2DReference( new FillBitmapPrimitive2D( createTranslateB2DHomMatrix(aPos.X(),aPos.Y()), FillBitmapAttribute(maCloseImg.GetBitmapEx(), B2DPoint(0,0), @@ -109,10 +101,6 @@ void TemplateView::Paint (const Rectangle &rRect) false) )); - // TODO Draw some shadow - Rectangle aBounds(Point(0, 0), Size(aWinSize.getWidth() - 1, aWinSize.getHeight() - 1)); - B2DPolygon aBoundsPolygon(Polygon(aBounds, 5, 5).getB2DPolygon()); - aSeq[nCount] = Primitive2DReference( new PolyPolygonHairlinePrimitive2D(B2DPolyPolygon(aBoundsPolygon), Color(0,0,0).getBColor())); mpProcessor->process(aSeq); } |