dev/null |binary icon-themes/galaxy/svx/res/slidezoombutton_10.png |binary icon-themes/galaxy/svx/res/slidezoomin_10.png |binary icon-themes/galaxy/svx/res/slidezoomout_10.png |binary icon-themes/galaxy/sw/res/doublepage_10x22.png |binary icon-themes/galaxy/sw/res/doublepage_a_10x22.png |binary icon-themes/galaxy/sw/res/emptypage_10x22.png |binary icon-themes/galaxy/sw/res/emptypage_a_10x22.png |binary icon-themes/galaxy/sw/res/twopages_10x22.png |binary icon-themes/galaxy/sw/res/twopages_a_10x22.png |binary sfx2/source/view/impviewframe.hxx | 1 svx/source/stbctrls/stbctrls.src | 6 +- svx/source/stbctrls/zoomsliderctrl.cxx | 50 +++++----------------- sw/source/ui/utlui/utlui.src | 12 ++--- sw/source/ui/utlui/viewlayoutctrl.cxx | 14 +++--- vcl/inc/vcl/decoview.hxx | 1 vcl/inc/vcl/window.hxx | 1 vcl/source/window/brdwin.cxx | 4 + vcl/source/window/decoview.cxx | 15 ++++++ 19 files changed, 52 insertions(+), 52 deletions(-)
New commits: commit 03cb0e5c363fc25f3d2acb60b51acc2369c4afa0 Author: Jan Holesovsky <[email protected]> Date: Tue May 22 18:47:55 2012 +0200 layout statusbar control: Implemented design by Mirek M. Change-Id: Icaef88ba850f40e2354e896f688d11abba31fd8a 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 0000000..bfa998b Binary files /dev/null and b/icon-themes/galaxy/sw/res/doublepage_10x22.png differ 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 7915920..0000000 Binary files a/icon-themes/galaxy/sw/res/doublepage_11x23.png and /dev/null differ 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 0000000..7423b4c Binary files /dev/null and b/icon-themes/galaxy/sw/res/doublepage_a_10x22.png differ 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 52584d4..0000000 Binary files a/icon-themes/galaxy/sw/res/doublepage_a_11x23.png and /dev/null differ 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 0000000..b72bbdc Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_10x22.png differ 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 c48d849..0000000 Binary files a/icon-themes/galaxy/sw/res/emptypage_11x15.png and /dev/null differ 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 0000000..ac011b8 Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png differ 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 4f63bed..0000000 Binary files a/icon-themes/galaxy/sw/res/emptypage_a_11x15.png and /dev/null differ 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 0000000..9c95268 Binary files /dev/null and b/icon-themes/galaxy/sw/res/twopages_10x22.png differ 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 99426df..0000000 Binary files a/icon-themes/galaxy/sw/res/twopages_11x25.png and /dev/null differ 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 0000000..1e095f8 Binary files /dev/null and b/icon-themes/galaxy/sw/res/twopages_a_10x22.png differ 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 6f3690e..0000000 Binary files a/icon-themes/galaxy/sw/res/twopages_a_11x25.png and /dev/null differ 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 f3a4954..0000000 Binary files a/icon-themes/hicontrast/sw/res/doublepage_11x23.png and /dev/null differ 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 c4816f8..0000000 Binary files a/icon-themes/hicontrast/sw/res/doublepage_a_11x23.png and /dev/null differ 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 6ef313c..0000000 Binary files a/icon-themes/hicontrast/sw/res/emptypage_11x15.png and /dev/null differ 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 167eed3..0000000 Binary files a/icon-themes/hicontrast/sw/res/emptypage_a_11x15.png and /dev/null differ 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 a139e36..0000000 Binary files a/icon-themes/hicontrast/sw/res/twopages_11x25.png and /dev/null differ 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 29d19e4..0000000 Binary files a/icon-themes/hicontrast/sw/res/twopages_a_11x25.png and /dev/null differ 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 ead9edf..0000000 Binary files a/icon-themes/human/sw/res/emptypage_11x15.png and /dev/null differ 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 3a97013..0000000 Binary files a/icon-themes/human/sw/res/emptypage_a_11x15.png and /dev/null differ 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 ead9edf..0000000 Binary files a/icon-themes/oxygen/sw/res/emptypage_11x15.png and /dev/null differ 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 3a97013..0000000 Binary files a/icon-themes/oxygen/sw/res/emptypage_a_11x15.png and /dev/null differ diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index 5087b5f..0895b43 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 40aa74b..d811d9d 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; commit bc1fd830be6165c364805c2ad09854ecc8e863a6 Author: Jan Holesovsky <[email protected]> Date: Tue May 22 18:00:27 2012 +0200 zoom slider: Implemented design by Mirek M. Simpler, and more light-weight now. Change-Id: I1d512f92714b0836dc75a187024af263e208484f diff --git a/icon-themes/galaxy/svx/res/slidezoombutton_10.png b/icon-themes/galaxy/svx/res/slidezoombutton_10.png new file mode 100644 index 0000000..da237b0 Binary files /dev/null and b/icon-themes/galaxy/svx/res/slidezoombutton_10.png differ diff --git a/icon-themes/galaxy/svx/res/slidezoomin_10.png b/icon-themes/galaxy/svx/res/slidezoomin_10.png new file mode 100644 index 0000000..0cafa0c Binary files /dev/null and b/icon-themes/galaxy/svx/res/slidezoomin_10.png differ diff --git a/icon-themes/galaxy/svx/res/slidezoomin_11.png b/icon-themes/galaxy/svx/res/slidezoomin_11.png deleted file mode 100644 index 9983b56..0000000 Binary files a/icon-themes/galaxy/svx/res/slidezoomin_11.png and /dev/null differ diff --git a/icon-themes/galaxy/svx/res/slidezoomout_10.png b/icon-themes/galaxy/svx/res/slidezoomout_10.png new file mode 100644 index 0000000..d730b61 Binary files /dev/null and b/icon-themes/galaxy/svx/res/slidezoomout_10.png differ diff --git a/icon-themes/galaxy/svx/res/slidezoomout_11.png b/icon-themes/galaxy/svx/res/slidezoomout_11.png deleted file mode 100644 index a0813f9..0000000 Binary files a/icon-themes/galaxy/svx/res/slidezoomout_11.png and /dev/null differ diff --git a/icon-themes/hicontrast/svx/res/slidezoomin_11.png b/icon-themes/hicontrast/svx/res/slidezoomin_11.png deleted file mode 100644 index 67a0bf1..0000000 Binary files a/icon-themes/hicontrast/svx/res/slidezoomin_11.png and /dev/null differ diff --git a/icon-themes/hicontrast/svx/res/slidezoomout_11.png b/icon-themes/hicontrast/svx/res/slidezoomout_11.png deleted file mode 100644 index b2dabbd..0000000 Binary files a/icon-themes/hicontrast/svx/res/slidezoomout_11.png and /dev/null differ diff --git a/icon-themes/human/svx/res/slidezoomin_11.png b/icon-themes/human/svx/res/slidezoomin_11.png deleted file mode 100644 index deee8a8..0000000 Binary files a/icon-themes/human/svx/res/slidezoomin_11.png and /dev/null differ diff --git a/icon-themes/human/svx/res/slidezoomout_11.png b/icon-themes/human/svx/res/slidezoomout_11.png deleted file mode 100644 index 06c7128..0000000 Binary files a/icon-themes/human/svx/res/slidezoomout_11.png and /dev/null differ diff --git a/icon-themes/oxygen/svx/res/slidezoomin_11.png b/icon-themes/oxygen/svx/res/slidezoomin_11.png deleted file mode 100644 index deee8a8..0000000 Binary files a/icon-themes/oxygen/svx/res/slidezoomin_11.png and /dev/null differ diff --git a/icon-themes/oxygen/svx/res/slidezoomout_11.png b/icon-themes/oxygen/svx/res/slidezoomout_11.png deleted file mode 100644 index 06c7128..0000000 Binary files a/icon-themes/oxygen/svx/res/slidezoomout_11.png and /dev/null differ diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index dea916d..745a8db 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -269,7 +269,7 @@ Image RID_SVXBMP_SLIDERBUTTON { ImageBitmap = Bitmap { - File = "navigationball_10.png" ; + File = "slidezoombutton_10.png" ; }; MaskColor = STD_MASKCOLOR; }; @@ -277,7 +277,7 @@ Image RID_SVXBMP_SLIDERDECREASE { ImageBitmap = Bitmap { - File = "slidezoomout_11.png" ; + File = "slidezoomout_10.png" ; }; MaskColor = STD_MASKCOLOR; }; @@ -285,7 +285,7 @@ Image RID_SVXBMP_SLIDERINCREASE { ImageBitmap = Bitmap { - File = "slidezoomin_11.png" ; + File = "slidezoomin_10.png" ; }; MaskColor = STD_MASKCOLOR; }; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 66b5d4d..71381d1 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -32,6 +32,7 @@ #include <vcl/status.hxx> #include <vcl/menu.hxx> #include <vcl/image.hxx> +#include <vcl/svapp.hxx> #include <svx/zoomslideritem.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -78,8 +79,8 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl const long nButtonWidth = 10; const long nButtonHeight = 10; -const long nIncDecWidth = 11; -const long nIncDecHeight = 11; +const long nIncDecWidth = 10; +const long nIncDecHeight = 10; const long nSliderHeight = 2; const long nSnappingHeight = 4; const long nSliderXOffset = 20; @@ -268,16 +269,17 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) Rectangle aRect = rUsrEvt.GetRect(); Rectangle aSlider = aRect; - aSlider.Top() += (aControlRect.GetHeight() - nSliderHeight)/2 - 1; - aSlider.Bottom() = aSlider.Top() + nSliderHeight; + aSlider.Top() += (aControlRect.GetHeight() - nSliderHeight)/2; + aSlider.Bottom() = aSlider.Top() + nSliderHeight - 1; aSlider.Left() += nSliderXOffset; aSlider.Right() -= nSliderXOffset; Color aOldLineColor = pDev->GetLineColor(); Color aOldFillColor = pDev->GetFillColor(); - pDev->SetLineColor( Color( COL_GRAY ) ); - pDev->SetFillColor( Color( COL_GRAY ) ); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + pDev->SetLineColor( rStyleSettings.GetShadowColor() ); + pDev->SetFillColor( rStyleSettings.GetShadowColor() ); // draw snapping points: std::vector< long >::iterator aSnappingPointIter; @@ -285,40 +287,14 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) aSnappingPointIter != mpImpl->maSnappingPointOffsets.end(); ++aSnappingPointIter ) { - Rectangle aSnapping( aRect ); - aSnapping.Bottom() = aSlider.Top(); - aSnapping.Top() = aSnapping.Bottom() - nSnappingHeight; - aSnapping.Left() += *aSnappingPointIter; - aSnapping.Right() = aSnapping.Left(); - pDev->DrawRect( aSnapping ); - - aSnapping.Top() += nSnappingHeight + nSliderHeight; - aSnapping.Bottom() += nSnappingHeight + nSliderHeight; - pDev->DrawRect( aSnapping ); + long nSnapPosX = aRect.Left() + *aSnappingPointIter; + + pDev->DrawRect( Rectangle( nSnapPosX - 1, aSlider.Top() - nSnappingHeight, + nSnapPosX, aSlider.Bottom() + nSnappingHeight ) ); } // draw slider - Rectangle aFirstLine( aSlider ); - aFirstLine.Bottom() = aFirstLine.Top(); - - Rectangle aSecondLine( aSlider ); - aSecondLine.Top() = aSecondLine.Bottom(); - - Rectangle aLeft( aSlider ); - aLeft.Right() = aLeft.Left(); - - Rectangle aRight( aSlider ); - aRight.Left() = aRight.Right(); - - pDev->SetLineColor( Color ( COL_WHITE ) ); - pDev->SetFillColor( Color ( COL_WHITE ) ); - pDev->DrawRect( aSecondLine ); - pDev->DrawRect( aRight ); - - pDev->SetLineColor( Color( COL_GRAY ) ); - pDev->SetFillColor( Color( COL_GRAY ) ); - pDev->DrawRect( aFirstLine ); - pDev->DrawRect( aLeft ); + pDev->DrawRect( aSlider ); // draw slider button Point aImagePoint = aRect.TopLeft(); commit 51fdf273e9893d3d05c99a09e1c2e5835a78e891 Author: Jan Holesovsky <[email protected]> Date: Tue May 22 15:44:13 2012 +0200 border window: Design by Mirek M. - make the 'shells' more lightweight. Just a line at the top and the bottom, we do not want the entire 3D effect here, it makes it visually incompatible with the window decorations. Change-Id: I262932fb5def21d5bc4fb347be6d6a07807bb4d2 diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index 16fe88a..9308894 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -87,6 +87,7 @@ public: bActive( sal_False ), pFrame( p ) { + SetBorderStyle( WINDOW_BORDER_TOPBOTTOM ); p->GetFrame().GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); } diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index 64b738e..b6b6f0f 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -52,6 +52,7 @@ class OutputDevice; #define FRAME_DRAW_GROUP ((sal_uInt16)0x0003) #define FRAME_DRAW_DOUBLEIN ((sal_uInt16)0x0004) #define FRAME_DRAW_DOUBLEOUT ((sal_uInt16)0x0005) +#define FRAME_DRAW_TOPBOTTOM ((sal_uInt16)0x0006) #define FRAME_DRAW_MENU ((sal_uInt16)0x0010) #define FRAME_DRAW_WINDOWBORDER ((sal_uInt16)0x0020) #define FRAME_DRAW_BORDERWINDOWBORDER ((sal_uInt16)0x0040) diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 94a3fbe..65118ca 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -292,6 +292,7 @@ typedef sal_uInt16 StateChangedType; #define WINDOW_BORDER_ACTIVE ((sal_uInt16)0x0004) #define WINDOW_BORDER_DOUBLEOUT ((sal_uInt16)0x0008) #define WINDOW_BORDER_MENU ((sal_uInt16)0x0010) +#define WINDOW_BORDER_TOPBOTTOM ((sal_uInt16)0x0020) #define WINDOW_BORDER_NOBORDER ((sal_uInt16)0x1000) #define WINDOW_BORDER_REMOVEBORDER ((sal_uInt16)0x2000) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 22dff35..9d397c2 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1199,6 +1199,8 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei // ist, dann Border nach aussen if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder ) nStyle |= FRAME_DRAW_DOUBLEOUT; + else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) + nStyle |= FRAME_DRAW_TOPBOTTOM; else nStyle |= FRAME_DRAW_DOUBLEIN; if ( nBorderStyle & WINDOW_BORDER_MONO ) @@ -1388,6 +1390,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* // ist, dann Border nach aussen if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder ) nStyle |= FRAME_DRAW_DOUBLEOUT; + else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) + nStyle |= FRAME_DRAW_TOPBOTTOM; else nStyle |= FRAME_DRAW_DOUBLEIN; if ( nBorderStyle & WINDOW_BORDER_MONO ) diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 6b6bc1a..878578d 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -734,6 +734,11 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, rRect.Right() -= 2; rRect.Bottom() -= 2; break; + + case FRAME_DRAW_TOPBOTTOM: + ++rRect.Top(); + --rRect.Bottom(); + break; } } else @@ -815,6 +820,16 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, rStyleSettings.GetShadowColor() ); } break; + + case FRAME_DRAW_TOPBOTTOM: + pDev->SetLineColor( rStyleSettings.GetShadowColor() ); + pDev->DrawLine( Point( rRect.Left(), rRect.Top() ), Point( rRect.Right(), rRect.Top() ) ); + pDev->DrawLine( Point( rRect.Left(), rRect.Bottom() ), Point( rRect.Right(), rRect.Bottom() ) ); + + // adjust target rectangle + ++rRect.Top(); + --rRect.Bottom(); + break; } } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
