summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-06-30 16:13:23 +0200
committerJan Holesovsky <kendy@collabora.com>2015-06-30 17:57:38 +0200
commit562d2c3337051da5d98d55a28dc391dab387b692 (patch)
tree23f2c945057aa1919cc099cd6542aa1461e0bf1f /include
parent1a8915ef8302b13b781977209ae1fa41f5f659dc (diff)
tdf#90452: Implement the new design of the startcenter.
See the comment 45 in the bug for the agreed design. Change-Id: I428f339df48f530f606525434a4a2be8a79acaab
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/thumbnailview.hxx11
-rw-r--r--include/sfx2/thumbnailviewitem.hxx2
2 files changed, 6 insertions, 7 deletions
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index b7375dd9f4a0..9000d32132de 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -232,10 +232,6 @@ public:
void ShowTooltips( bool bShowTooltips );
- Color GetColor() const { return maColor; }
-
- bool IsColor() const { return maColor.GetTransparency() == 0; }
-
void filterItems (const boost::function<bool (const ThumbnailViewItem*) > &func);
void sortItems (const boost::function<bool (const ThumbnailViewItem*,
@@ -283,14 +279,12 @@ protected:
friend class ThumbnailViewAcc;
friend class ThumbnailViewItemAcc;
- using Control::ImplInitSettings;
using Window::ImplInit;
void CalculateItemPositions (bool bScrollBarUsed = false);
void MakeItemVisible( sal_uInt16 nId );
SFX2_DLLPRIVATE void ImplInit();
- SFX2_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
@@ -330,7 +324,10 @@ protected:
bool mbIsTransientChildrenDisabled : 1;
bool mbHasVisibleItems : 1;
bool mbShowTooltips : 1;
- Color maColor;
+ Color maFillColor;
+ Color maTextColor;
+ Color maHighlightColor;
+ Color maHighlightTextColor;
Link<> maItemStateHdl;
ThumbnailItemAttributes* mpItemAttrs;
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index 48238af77081..ab2194b1c3d6 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -57,7 +57,9 @@ struct ThumbnailItemAttributes
{
sal_uInt32 nMaxTextLength;
basegfx::BColor aFillColor;
+ basegfx::BColor aTextColor;
basegfx::BColor aHighlightColor;
+ basegfx::BColor aHighlightTextColor;
basegfx::B2DVector aFontSize;
drawinglayer::attribute::FontAttribute aFontAttr;
};