From 5ae64e4b0c23f209410fe84df041c9445234df74 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 27 Mar 2012 12:32:05 +0100 Subject: fix vertical align when switching mode in multibar fdo#44140 switching between SumAssign & OkCancel mode in the multibar results in a slight 'jumping' of the toolbar items when end up out of allignment with the other toolbar items. --- vcl/source/window/toolbox.cxx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 4dc2458acc58..7b317a180651 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2722,7 +2722,19 @@ void ToolBox::ImplFormat( sal_Bool bResize ) // if special TBX_LAYOUT_LOCKVERT lock vertical position // don't recalulate the vertical position of the item if ( meLayoutMode == TBX_LAYOUT_LOCKVERT && mnLines == 1 ) - it->maCalcRect.Top() = it->maRect.Top(); + { + // Somewhat of a hack here, calc deletes and re-adds + // the sum/assign & ok/cancel items dynamically. + // Because TBX_LAYOUT_LOCKVERT effectively prevents + // recalculation of the vertical pos of an item the + // it->maRect.Top() for those newly added items is + // 0. The hack here is that we want to effectively + // recalculate the vertical pos for those added + // items here. ( Note: assume mnMaxItemHeight is + // equal to the LineSize when multibar has a single + // line size ) + it->maCalcRect.Top() = it->maRect.Top() ? it->maRect.Top() : ( nY + ( mnMaxItemHeight-aCurrentItemSize.Height())/2 ); + } else it->maCalcRect.Top() = nY+(nLineSize-aCurrentItemSize.Height())/2; it->maCalcRect.Right() = nX+aCurrentItemSize.Width()-1; -- cgit