[Libreoffice-commits] .: Branch 'feature/template-dialog' - 4 commits - svtools/inc svtools/source
Rafael Dominguez
rdominguez at kemper.freedesktop.org
Sun Jun 3 14:46:15 PDT 2012
svtools/inc/svtools/thumbnailview.hxx | 10 ----
svtools/source/control/thumbnailview.cxx | 69 +++++--------------------------
svtools/source/control/thumbv_acc.cxx | 7 ---
svtools/source/control/thumbv_itm.cxx | 1
svtools/source/control/thumbv_itm.hxx | 11 ----
5 files changed, 14 insertions(+), 84 deletions(-)
New commits:
commit 28a143cb7d19fe618b33f1af02d7990d007e88a4
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sun Jun 3 16:39:51 2012 -0430
Remove support for setting thumbnail item background color.
Change-Id: I7bcc1437a007383b9a7ab4fc821398c014f4aa45
diff --git a/svtools/inc/svtools/thumbnailview.hxx b/svtools/inc/svtools/thumbnailview.hxx
index 1f63ccf..f5b4cbe 100644
--- a/svtools/inc/svtools/thumbnailview.hxx
+++ b/svtools/inc/svtools/thumbnailview.hxx
@@ -195,16 +195,12 @@ public:
void InsertItem( sal_uInt16 nItemId, const Image& rImage,
size_t nPos = THUMBNAILVIEW_APPEND );
- void InsertItem( sal_uInt16 nItemId, const Color& rColor,
- size_t nPos = THUMBNAILVIEW_APPEND );
-
void InsertItem( sal_uInt16 nItemId,
const Image& rImage, const rtl::OUString &rStr,
size_t nPos = THUMBNAILVIEW_APPEND );
void InsertItem( sal_uInt16 nItemId,
- const Color& rColor, const rtl::OUString &rStr,
- size_t nPos = THUMBNAILVIEW_APPEND );
+ const rtl::OUString &rText, size_t nPosPEND );
void InsertItem( sal_uInt16 nItemId, size_t nPos = THUMBNAILVIEW_APPEND );
@@ -259,10 +255,6 @@ public:
Image GetItemImage( sal_uInt16 nItemId ) const;
- void SetItemColor( sal_uInt16 nItemId, const Color& rColor );
-
- Color GetItemColor( sal_uInt16 nItemId ) const;
-
void SetItemData( sal_uInt16 nItemId, void* pData );
void* GetItemData( sal_uInt16 nItemId ) const;
diff --git a/svtools/source/control/thumbnailview.cxx b/svtools/source/control/thumbnailview.cxx
index 64d5333..0a190bb 100644
--- a/svtools/source/control/thumbnailview.cxx
+++ b/svtools/source/control/thumbnailview.cxx
@@ -219,9 +219,7 @@ void ThumbnailView::DrawItem (ThumbnailViewItem *pItem, const Rectangle &aRect)
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- if ( pItem->maColor.GetTransparency() == 0 )
- maVirDev.SetFillColor( pItem->maColor );
- else if ( IsColor() )
+ if ( IsColor() )
maVirDev.SetFillColor( maColor );
else if ( nStyle & WB_MENUSTYLEVALUESET )
maVirDev.SetFillColor( rStyleSettings.GetMenuColor() );
@@ -1475,14 +1473,6 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t
ImplInsertItem( pItem, nPos );
}
-void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos )
-{
- ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
- pItem->mnId = nItemId;
- pItem->maColor = rColor;
- ImplInsertItem( pItem, nPos );
-}
-
void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Image& rImage,
const rtl::OUString& rText, size_t nPos )
{
@@ -1493,12 +1483,11 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Image& rImage,
ImplInsertItem( pItem, nPos );
}
-void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Color& rColor,
- const rtl::OUString& rText, size_t nPos )
+void ThumbnailView::InsertItem( sal_uInt16 nItemId,
+ const rtl::OUString& rText, size_t nPos )
{
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
pItem->mnId = nItemId;
- pItem->maColor = rColor;
pItem->maText = rText;
ImplInsertItem( pItem, nPos );
}
@@ -1839,36 +1828,6 @@ Image ThumbnailView::GetItemImage( sal_uInt16 nItemId ) const
return Image();
}
-void ThumbnailView::SetItemColor( sal_uInt16 nItemId, const Color& rColor )
-{
- size_t nPos = GetItemPos( nItemId );
-
- if ( nPos == THUMBNAILVIEW_ITEM_NOTFOUND )
- return;
-
- ThumbnailViewItem* pItem = mItemList[nPos];
- pItem->maColor = rColor;
-
- if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
- {
- const Rectangle aRect = ImplGetItemRect(nPos);
- DrawItem( pItem, aRect );
- Invalidate( aRect );
- }
- else
- mbFormat = true;
-}
-
-Color ThumbnailView::GetItemColor( sal_uInt16 nItemId ) const
-{
- size_t nPos = GetItemPos( nItemId );
-
- if ( nPos != THUMBNAILVIEW_ITEM_NOTFOUND )
- return mItemList[nPos]->maColor;
- else
- return Color();
-}
-
void ThumbnailView::SetItemData( sal_uInt16 nItemId, void* pData )
{
size_t nPos = GetItemPos( nItemId );
diff --git a/svtools/source/control/thumbv_acc.cxx b/svtools/source/control/thumbv_acc.cxx
index c339c1a..bd3557f 100644
--- a/svtools/source/control/thumbv_acc.cxx
+++ b/svtools/source/control/thumbv_acc.cxx
@@ -1020,12 +1020,7 @@ sal_Int32 SAL_CALL ThumbnailViewItemAcc::getForeground( )
sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground( )
throw (uno::RuntimeException)
{
- sal_uInt32 nColor;
- if (mpParent->maColor.GetTransparency() == 0)
- nColor = mpParent->maColor.GetColor();
- else
- nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
- return static_cast<sal_Int32>(nColor);
+ return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor());
}
sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
diff --git a/svtools/source/control/thumbv_itm.cxx b/svtools/source/control/thumbv_itm.cxx
index e0fa52c..17803cb 100644
--- a/svtools/source/control/thumbv_itm.cxx
+++ b/svtools/source/control/thumbv_itm.cxx
@@ -37,7 +37,6 @@ ThumbnailViewItem::ThumbnailViewItem( ThumbnailView& rParent )
: mrParent(rParent)
, mnId(0)
, mbVisible(true)
- , maColor (COL_TRANSPARENT)
, mpData(NULL)
, mpxAcc(NULL)
{
diff --git a/svtools/source/control/thumbv_itm.hxx b/svtools/source/control/thumbv_itm.hxx
index 117a0a3..bec2b84 100644
--- a/svtools/source/control/thumbv_itm.hxx
+++ b/svtools/source/control/thumbv_itm.hxx
@@ -30,7 +30,6 @@
#define THUMBV_ITM_HXX
#include <osl/mutex.hxx>
-#include <tools/color.hxx>
#include <vcl/image.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -45,7 +44,6 @@ struct ThumbnailViewItem
sal_uInt16 mnId;
bool mbVisible;
Image maImage;
- Color maColor;
rtl::OUString maText;
void* mpData;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
commit ae3b68d46c0aa827054c790630fabaac0dfc393b
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sun Jun 3 16:27:03 2012 -0430
Display thumbnail associated text below it and horizontal centered.
Change-Id: I99c4bf6ec7a4f71fb8a1803120f1706fd2d5f457
diff --git a/svtools/source/control/thumbnailview.cxx b/svtools/source/control/thumbnailview.cxx
index d3bb826..64d5333 100644
--- a/svtools/source/control/thumbnailview.cxx
+++ b/svtools/source/control/thumbnailview.cxx
@@ -252,6 +252,13 @@ void ThumbnailView::DrawItem (ThumbnailViewItem *pItem, const Rectangle &aRect)
}
else
maVirDev.DrawImage( aPos, pItem->maImage, nImageStyle );
+
+ // Draw centered text below thumbnail
+ aPos.Y() += 5 + aImageSize.Height();
+ aPos.X() = aRect.Left() + (aRectSize.Width() - maVirDev.GetTextWidth(pItem->maText))/2;
+
+ maVirDev.DrawText(aPos,pItem->maText);
+
}
}
}
commit e9f88dc0de4e85bd10b17f809f3ae28aaf679f5b
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sun Jun 3 13:59:58 2012 -0430
Make default color for items transparent.
Change-Id: I98cea3c2de5a16e231a426c2131ce776ba33c459
diff --git a/svtools/source/control/thumbv_itm.cxx b/svtools/source/control/thumbv_itm.cxx
index 17803cb..e0fa52c 100644
--- a/svtools/source/control/thumbv_itm.cxx
+++ b/svtools/source/control/thumbv_itm.cxx
@@ -37,6 +37,7 @@ ThumbnailViewItem::ThumbnailViewItem( ThumbnailView& rParent )
: mrParent(rParent)
, mnId(0)
, mbVisible(true)
+ , maColor (COL_TRANSPARENT)
, mpData(NULL)
, mpxAcc(NULL)
{
commit 3bb15a497877668ba4883aeb3ad56ee382db85c0
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sun Jun 3 13:53:09 2012 -0430
Remove classification of thumbnailview items.
Change-Id: Ic4a18eda66c74d53bcb471bbd6ac9518e2319c9c
diff --git a/svtools/source/control/thumbnailview.cxx b/svtools/source/control/thumbnailview.cxx
index a19da66..d3bb826 100644
--- a/svtools/source/control/thumbnailview.cxx
+++ b/svtools/source/control/thumbnailview.cxx
@@ -471,7 +471,6 @@ void ThumbnailView::Format()
mpNoneItem = new ThumbnailViewItem( *this );
mpNoneItem->mnId = 0;
- mpNoneItem->meType = THUMBNAILITEM_NONE;
mpNoneItem->mbVisible = true;
maNoneItemRect.Left() = x;
maNoneItemRect.Top() = y;
@@ -1465,7 +1464,6 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t
{
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
pItem->mnId = nItemId;
- pItem->meType = THUMBNAILITEM_IMAGE;
pItem->maImage = rImage;
ImplInsertItem( pItem, nPos );
}
@@ -1474,7 +1472,6 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t
{
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
pItem->mnId = nItemId;
- pItem->meType = THUMBNAILITEM_COLOR;
pItem->maColor = rColor;
ImplInsertItem( pItem, nPos );
}
@@ -1484,7 +1481,6 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Image& rImage,
{
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
pItem->mnId = nItemId;
- pItem->meType = THUMBNAILITEM_IMAGE;
pItem->maImage = rImage;
pItem->maText = rText;
ImplInsertItem( pItem, nPos );
@@ -1495,7 +1491,6 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, const Color& rColor,
{
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
pItem->mnId = nItemId;
- pItem->meType = THUMBNAILITEM_COLOR;
pItem->maColor = rColor;
pItem->maText = rText;
ImplInsertItem( pItem, nPos );
@@ -1505,7 +1500,6 @@ void ThumbnailView::InsertItem( sal_uInt16 nItemId, size_t nPos )
{
ThumbnailViewItem* pItem = new ThumbnailViewItem( *this );
pItem->mnId = nItemId;
- pItem->meType = THUMBNAILITEM_USERDRAW;
ImplInsertItem( pItem, nPos );
}
@@ -1816,7 +1810,6 @@ void ThumbnailView::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
return;
ThumbnailViewItem* pItem = mItemList[nPos];
- pItem->meType = THUMBNAILITEM_IMAGE;
pItem->maImage = rImage;
if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
@@ -1847,7 +1840,6 @@ void ThumbnailView::SetItemColor( sal_uInt16 nItemId, const Color& rColor )
return;
ThumbnailViewItem* pItem = mItemList[nPos];
- pItem->meType = THUMBNAILITEM_COLOR;
pItem->maColor = rColor;
if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
@@ -1880,17 +1872,14 @@ void ThumbnailView::SetItemData( sal_uInt16 nItemId, void* pData )
ThumbnailViewItem* pItem = mItemList[nPos];
pItem->mpData = pData;
- if ( pItem->meType == THUMBNAILITEM_USERDRAW )
+ if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
{
- if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
- {
- const Rectangle aRect = ImplGetItemRect(nPos);
- DrawItem( pItem, aRect );
- Invalidate( aRect );
- }
- else
- mbFormat = true;
+ const Rectangle aRect = ImplGetItemRect(nPos);
+ DrawItem( pItem, aRect );
+ Invalidate( aRect );
}
+ else
+ mbFormat = true;
}
void* ThumbnailView::GetItemData( sal_uInt16 nItemId ) const
diff --git a/svtools/source/control/thumbv_acc.cxx b/svtools/source/control/thumbv_acc.cxx
index ed392a4..c339c1a 100644
--- a/svtools/source/control/thumbv_acc.cxx
+++ b/svtools/source/control/thumbv_acc.cxx
@@ -1021,7 +1021,7 @@ sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground( )
throw (uno::RuntimeException)
{
sal_uInt32 nColor;
- if (mpParent && mpParent->meType == THUMBNAILITEM_COLOR)
+ if (mpParent->maColor.GetTransparency() == 0)
nColor = mpParent->maColor.GetColor();
else
nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
diff --git a/svtools/source/control/thumbv_itm.cxx b/svtools/source/control/thumbv_itm.cxx
index c695343..17803cb 100644
--- a/svtools/source/control/thumbv_itm.cxx
+++ b/svtools/source/control/thumbv_itm.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
ThumbnailViewItem::ThumbnailViewItem( ThumbnailView& rParent )
: mrParent(rParent)
, mnId(0)
- , meType(THUMBNAILITEM_NONE)
, mbVisible(true)
, mpData(NULL)
, mpxAcc(NULL)
diff --git a/svtools/source/control/thumbv_itm.hxx b/svtools/source/control/thumbv_itm.hxx
index 4d9c412..117a0a3 100644
--- a/svtools/source/control/thumbv_itm.hxx
+++ b/svtools/source/control/thumbv_itm.hxx
@@ -37,21 +37,12 @@
#define THUMBNAILVIEW_ITEM_NONEITEM 0xFFFE
-enum ThumbnailViewItemType
-{
- THUMBNAILITEM_NONE,
- THUMBNAILITEM_IMAGE,
- THUMBNAILITEM_COLOR,
- THUMBNAILITEM_USERDRAW
-};
-
class ThumbnailView;
struct ThumbnailViewItem
{
ThumbnailView &mrParent;
sal_uInt16 mnId;
- sal_uInt8 meType;
bool mbVisible;
Image maImage;
Color maColor;
More information about the Libreoffice-commits
mailing list