layout statusbar control: Implemented design by Mirek M.

Change-Id: Icaef88ba850f40e2354e896f688d11abba31fd8a

24 files changed, 14 insertions, 12 deletions

diff --git a/icon-themes/galaxy/sw/res/doublepage_10x22.png b/icon-themes/galaxy/sw/res/doublepage_10x22.png
new file mode 100644
index 000000000000..bfa998b48717
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/doublepage_10x22.png
diff --git a/icon-themes/galaxy/sw/res/doublepage_11x23.png b/icon-themes/galaxy/sw/res/doublepage_11x23.png
deleted file mode 100644
index 79159200d913..000000000000
--- a/icon-themes/galaxy/sw/res/doublepage_11x23.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sw/res/doublepage_a_10x22.png b/icon-themes/galaxy/sw/res/doublepage_a_10x22.png
new file mode 100644
index 000000000000..7423b4c018f6
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/doublepage_a_10x22.png
diff --git a/icon-themes/galaxy/sw/res/doublepage_a_11x23.png b/icon-themes/galaxy/sw/res/doublepage_a_11x23.png
deleted file mode 100644
index 52584d4de54c..000000000000
--- a/icon-themes/galaxy/sw/res/doublepage_a_11x23.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sw/res/emptypage_10x22.png b/icon-themes/galaxy/sw/res/emptypage_10x22.png
new file mode 100644
index 000000000000..b72bbdc8abcf
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/emptypage_10x22.png
diff --git a/icon-themes/galaxy/sw/res/emptypage_11x15.png b/icon-themes/galaxy/sw/res/emptypage_11x15.png
deleted file mode 100644
index c48d849b8a99..000000000000
--- a/icon-themes/galaxy/sw/res/emptypage_11x15.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png
new file mode 100644
index 000000000000..ac011b843df8
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_11x15.png b/icon-themes/galaxy/sw/res/emptypage_a_11x15.png
deleted file mode 100644
index 4f63bed1c12d..000000000000
--- a/icon-themes/galaxy/sw/res/emptypage_a_11x15.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sw/res/twopages_10x22.png b/icon-themes/galaxy/sw/res/twopages_10x22.png
new file mode 100644
index 000000000000..9c9526819b36
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/twopages_10x22.png
diff --git a/icon-themes/galaxy/sw/res/twopages_11x25.png b/icon-themes/galaxy/sw/res/twopages_11x25.png
deleted file mode 100644
index 99426dfa3295..000000000000
--- a/icon-themes/galaxy/sw/res/twopages_11x25.png
+++ /dev/null
diff --git a/icon-themes/galaxy/sw/res/twopages_a_10x22.png b/icon-themes/galaxy/sw/res/twopages_a_10x22.png
new file mode 100644
index 000000000000..1e095f8bba81
--- /dev/null
+++ b/icon-themes/galaxy/sw/res/twopages_a_10x22.png
diff --git a/icon-themes/galaxy/sw/res/twopages_a_11x25.png b/icon-themes/galaxy/sw/res/twopages_a_11x25.png
deleted file mode 100644
index 6f3690e3d7d6..000000000000
--- a/icon-themes/galaxy/sw/res/twopages_a_11x25.png
+++ /dev/null
diff --git a/icon-themes/hicontrast/sw/res/doublepage_11x23.png b/icon-themes/hicontrast/sw/res/doublepage_11x23.png
deleted file mode 100644
index f3a4954fb51c..000000000000
--- a/icon-themes/hicontrast/sw/res/doublepage_11x23.png
+++ /dev/null
diff --git a/icon-themes/hicontrast/sw/res/doublepage_a_11x23.png b/icon-themes/hicontrast/sw/res/doublepage_a_11x23.png
deleted file mode 100644
index c4816f86b2fe..000000000000
--- a/icon-themes/hicontrast/sw/res/doublepage_a_11x23.png
+++ /dev/null
diff --git a/icon-themes/hicontrast/sw/res/emptypage_11x15.png b/icon-themes/hicontrast/sw/res/emptypage_11x15.png
deleted file mode 100644
index 6ef313ce7252..000000000000
--- a/icon-themes/hicontrast/sw/res/emptypage_11x15.png
+++ /dev/null
diff --git a/icon-themes/hicontrast/sw/res/emptypage_a_11x15.png b/icon-themes/hicontrast/sw/res/emptypage_a_11x15.png
deleted file mode 100644
index 167eed35dab0..000000000000
--- a/icon-themes/hicontrast/sw/res/emptypage_a_11x15.png
+++ /dev/null
diff --git a/icon-themes/hicontrast/sw/res/twopages_11x25.png b/icon-themes/hicontrast/sw/res/twopages_11x25.png
deleted file mode 100644
index a139e36f0dd3..000000000000
--- a/icon-themes/hicontrast/sw/res/twopages_11x25.png
+++ /dev/null
diff --git a/icon-themes/hicontrast/sw/res/twopages_a_11x25.png b/icon-themes/hicontrast/sw/res/twopages_a_11x25.png
deleted file mode 100644
index 29d19e412fb8..000000000000
--- a/icon-themes/hicontrast/sw/res/twopages_a_11x25.png
+++ /dev/null
diff --git a/icon-themes/human/sw/res/emptypage_11x15.png b/icon-themes/human/sw/res/emptypage_11x15.png
deleted file mode 100644
index ead9edfb23d9..000000000000
--- a/icon-themes/human/sw/res/emptypage_11x15.png
+++ /dev/null
diff --git a/icon-themes/human/sw/res/emptypage_a_11x15.png b/icon-themes/human/sw/res/emptypage_a_11x15.png
deleted file mode 100644
index 3a970134b1b1..000000000000
--- a/icon-themes/human/sw/res/emptypage_a_11x15.png
+++ /dev/null
diff --git a/icon-themes/oxygen/sw/res/emptypage_11x15.png b/icon-themes/oxygen/sw/res/emptypage_11x15.png
deleted file mode 100644
index ead9edfb23d9..000000000000
--- a/icon-themes/oxygen/sw/res/emptypage_11x15.png
+++ /dev/null
diff --git a/icon-themes/oxygen/sw/res/emptypage_a_11x15.png b/icon-themes/oxygen/sw/res/emptypage_a_11x15.png
deleted file mode 100644
index 3a970134b1b1..000000000000
--- a/icon-themes/oxygen/sw/res/emptypage_a_11x15.png
+++ /dev/null
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 5087b5f0934b..0895b43fa2c0 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -323,7 +323,7 @@ Image IMG_VIEWLAYOUT_AUTOMATIC
 {
     ImageBitmap = Bitmap
     {
-        File = "twopages_11x25.png" ;
+        File = "twopages_10x22.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -331,7 +331,7 @@ Image IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE
 {
     ImageBitmap = Bitmap
     {
-        File = "twopages_a_11x25.png" ;
+        File = "twopages_a_10x22.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -340,7 +340,7 @@ Image IMG_VIEWLAYOUT_BOOKMODE
 {
     ImageBitmap = Bitmap
     {
-        File = "doublepage_11x23.png" ;
+        File = "doublepage_10x22.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -348,7 +348,7 @@ Image IMG_VIEWLAYOUT_BOOKMODE_ACTIVE
 {
     ImageBitmap = Bitmap
     {
-        File = "doublepage_a_11x23.png" ;
+        File = "doublepage_a_10x22.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -357,7 +357,7 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN
 {
     ImageBitmap = Bitmap
     {
-        File = "emptypage_11x15.png" ;
+        File = "emptypage_10x22.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -365,7 +365,7 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
 {
     ImageBitmap = Bitmap
     {
-        File = "emptypage_a_11x15.png" ;
+        File = "emptypage_a_10x22.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 40aa74b381c5..d811d9db37c0 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -41,11 +41,11 @@
 
 SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem );
 
-const long nImageWidthSingle = 15;
-const long nImageWidthAuto = 25;
-const long nImageWidthBook = 23;
-const long nImageWidthSum = 63;
-const long nImageHeight = 11;
+const long nImageWidthSingle = 22;
+const long nImageWidthAuto = 22;
+const long nImageWidthBook = 22;
+const long nImageWidthSum = nImageWidthSingle + nImageWidthAuto + nImageWidthBook;
+const long nImageHeight = 10;
 
 struct SwViewLayoutControl::SwViewLayoutControl_Impl
 {
@@ -111,12 +111,14 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
     OutputDevice*       pDev =  rUsrEvt.GetDevice();
     Rectangle           aRect = rUsrEvt.GetRect();
 
+    const Rectangle aControlRect = getControlRect();
+
     const bool bSingleColumn    = 0 == mpImpl->mnState;
     const bool bAutomatic       = 1 == mpImpl->mnState;
     const bool bBookMode        = 2 == mpImpl->mnState;
 
     const long nXOffset = (aRect.GetWidth()  - nImageWidthSum)/2;
-    const long nYOffset = (aRect.GetHeight() - nImageHeight)/2;
+    const long nYOffset = (aControlRect.GetHeight() - nImageHeight)/2;
 
     aRect.Left() = aRect.Left() + nXOffset;
     aRect.Top()  = aRect.Top() + nYOffset;