summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-22 16:56:45 +0100
committerJan Holesovsky <kendy@collabora.com>2014-11-23 17:37:29 +0100
commita96be6ac1be2e9ced1c63dbb817d8f959a61c8c3 (patch)
tree52592791adf07ce2c7a4327951c87e8c97959cf0 /sfx2
parent30c083a704ed545da002c8a12acead76e4babb6f (diff)
Default to collapsed sidebars everywhere but in Impress.
Change-Id: I2fe092189c922ddf36efc8dd8d0fba14f91fc0b0
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx13
1 files changed, 13 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index f6aa2fdf5222..fbba48b032a3 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -52,7 +52,20 @@ SidebarChildWindow::SidebarChildWindow (
SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(this->pWindow);
if (pDockingParent != NULL)
+ {
+ if (pInfo && pInfo->aExtraString.isEmpty() && pInfo->aModule != "simpress")
+ {
+ // When this is the first start (never had the sidebar open yet),
+ // default to non-expanded sidebars in Writer, Calc, and Draw
+ //
+ // HACK: unfortunately I haven't found a clean solution to do
+ // this, so do it this way:
+ //
+ pDockingParent->SetSizePixel(Size(TabBar::GetDefaultWidth() * pWindow->GetDPIScaleFactor(),
+ pDockingParent->GetSizePixel().Height()));
+ }
pDockingParent->Initialize(pInfo);
+ }
SetHideNotDelete(true);
this->pWindow->Show();