diff options
| author | Thorsten Wagner <thorsten.wagner.4@gmail.com> | 2020-06-16 00:28:41 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-06-17 14:38:40 +0200 |
| commit | 4366fdf8cb7b18bfc8f4665aa09f35e20467d3a5 (patch) | |
| tree | f93dd81cb6883fbf7016e2c80d49d8667ddc04e2 /vcl | |
| parent | 401a24378dab1d06ce305b7b090938a706720957 (diff) | |
tdf#133692: Spacing within Calc formulabar reworked
Change-Id: I4f590589fdc390bfa11f7db86e65ccab3dd084fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96403
Tested-by: Jenkins
Tested-by: Andreas Kainz <kainz.a@gmail.com>
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
(cherry picked from commit 45261267964d6fa1e820b0e4a7745e2e10fcb5f7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96503
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 182c085a152e..8ddb536f7bb4 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -189,10 +189,10 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); // reserve DragArea only for dockable toolbars - int dragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? ImplGetDragWidth() : 0; + int dragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? ImplGetDragWidth() : 0; - // no shadow border for dockable toolbars - int borderwidth = pWrapper ? 0: 2; + // no shadow border for dockable toolbars and toolbars with WB_NOSHADOW bit set, e.g. Calc's formulabar + int borderwidth = ( pWrapper || mnWinStyle & WB_NOSHADOW ) ? 0 : 2; if ( eAlign == WindowAlign::Top ) { @@ -551,8 +551,10 @@ void ToolBox::ImplDrawBorder(vcl::RenderContext& rRenderContext) ImplDockingWindowWrapper* pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper(this); - // draw borders for ordinary toolbars only (not dockable) - if( pWrapper ) + // draw borders for ordinary toolbars only (not dockable), do not draw borders for toolbars with WB_NOSHADOW bit set, + // e.g. Calc's formulabar + + if( pWrapper || mnWinStyle & WB_NOSHADOW ) return; if (meAlign == WindowAlign::Bottom) |