summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Dominguez <venccsralph@gmail.com>2012-08-03 11:17:07 -0430
committerRafael Dominguez <venccsralph@gmail.com>2012-08-03 18:31:32 -0430
commite93169a97b1832d00aaf2b3e75a70c7a7f95c19a (patch)
treee662681ddc94811f040b66d46eb897a56ca7904f
parent8d35d24f7991e77814838bb6edbfae051a063a6c (diff)
Make local overlay fill all the window.
- Since we dont need to support drag and drop its better to just display the full content of the folder as possible. - Resize overlay when view gets resized. Change-Id: I12909ae14b13dbaf5ec844f94268f8d86a84d91a
-rw-r--r--sfx2/inc/sfx2/templateabstractview.hxx2
-rw-r--r--sfx2/inc/sfx2/templatelocalview.hxx2
-rw-r--r--sfx2/inc/sfx2/templateonlineview.hxx4
-rw-r--r--sfx2/source/control/templateabstractview.cxx5
-rw-r--r--sfx2/source/control/templatelocalview.cxx19
-rw-r--r--sfx2/source/control/templateonlineview.cxx6
6 files changed, 7 insertions, 31 deletions
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx
index 1907e5c2142c..943b622221bd 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -94,6 +94,8 @@ public:
protected:
+ virtual void Resize();
+
virtual void OnSelectionMode (bool bMode);
DECL_LINK(OverlayItemStateHdl, const ThumbnailViewItem*);
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx
index 67a56ae5d5a9..d0b22d54e049 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -55,8 +55,6 @@ public:
private:
- virtual void Resize ();
-
virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
DECL_LINK(ChangeNameHdl, TemplateView*);
diff --git a/sfx2/inc/sfx2/templateonlineview.hxx b/sfx2/inc/sfx2/templateonlineview.hxx
index 035456033820..a3b137312a4f 100644
--- a/sfx2/inc/sfx2/templateonlineview.hxx
+++ b/sfx2/inc/sfx2/templateonlineview.hxx
@@ -40,10 +40,6 @@ public:
private:
- virtual void Resize ();
-
-private:
-
std::vector<TemplateOnlineViewItem*> maRepositories;
com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
};
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 0554c9d58ba8..99539e06acbe 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -228,6 +228,11 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const rtl::OUString &msURL, long
return TemplateAbstractView::scaleImg(aThumbnail,width,height);
}
+void TemplateAbstractView::Resize()
+{
+ mpItemView->SetSizePixel(GetSizePixel());
+}
+
void TemplateAbstractView::OnSelectionMode (bool bMode)
{
if (mpItemView->IsVisible())
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 119168dd8ef4..146000880c6c 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -29,13 +29,9 @@
#define ITEM_MAX_WIDTH 192
#define ITEM_MAX_HEIGHT 192
#define ITEM_PADDING 5
-#define ITEM_SPACE 20
#define THUMBNAIL_MAX_HEIGHT 128 - 2*ITEM_PADDING
#define THUMBNAIL_MAX_WIDTH ITEM_MAX_WIDTH - 2*ITEM_PADDING
-#define INIT_VIEW_COLS 3
-#define INIT_VIEW_LINES 1
-
void lcl_updateThumbnails (TemplateLocalViewItem *pItem);
class FolderFilter_Application
@@ -111,11 +107,7 @@ TemplateLocalView::TemplateLocalView ( Window* pParent, const ResId& rResId, boo
meFilterOption(FILTER_APP_NONE),
mpDocTemplates(new SfxDocumentTemplates)
{
- Size aViewSize = mpItemView->CalcWindowSizePixel(INIT_VIEW_COLS,INIT_VIEW_LINES,
- ITEM_MAX_WIDTH,ITEM_MAX_HEIGHT,ITEM_SPACE);
-
mpItemView->SetColor(Color(COL_WHITE));
- mpItemView->SetSizePixel(aViewSize);
mpItemView->setItemDimensions(ITEM_MAX_WIDTH,THUMBNAIL_MAX_HEIGHT,
ITEM_MAX_HEIGHT-THUMBNAIL_MAX_HEIGHT,
ITEM_PADDING);
@@ -575,17 +567,6 @@ void TemplateLocalView::copyFrom (TemplateLocalViewItem *pItem, const rtl::OUStr
}
}
-void TemplateLocalView::Resize()
-{
- Size aWinSize = GetOutputSize();
- Size aViewSize = mpItemView->GetSizePixel();
-
- Point aPos;
- aPos.setX((aWinSize.getWidth() - aViewSize.getWidth())/2);
-
- mpItemView->SetPosPixel(aPos);
-}
-
void TemplateLocalView::OnItemDblClicked (ThumbnailViewItem *pRegionItem)
{
// Fill templates
diff --git a/sfx2/source/control/templateonlineview.cxx b/sfx2/source/control/templateonlineview.cxx
index b8b978fad849..0ed95c5f57a8 100644
--- a/sfx2/source/control/templateonlineview.cxx
+++ b/sfx2/source/control/templateonlineview.cxx
@@ -29,7 +29,6 @@
#define ITEM_MAX_WIDTH 192
#define ITEM_MAX_HEIGHT 192
#define ITEM_PADDING 5
-#define ITEM_SPACE 20
#define THUMBNAIL_MAX_HEIGHT 128 - 2*ITEM_PADDING
#define THUMBNAIL_MAX_WIDTH ITEM_MAX_WIDTH - 2*ITEM_PADDING
@@ -251,9 +250,4 @@ void TemplateOnlineView::setItemDimensions(long ItemWidth, long ThumbnailHeight,
mpItemView->setItemDimensions(ItemWidth,ThumbnailHeight,DisplayHeight,itemPadding);
}
-void TemplateOnlineView::Resize()
-{
- mpItemView->SetSizePixel(GetSizePixel());
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */