summaryrefslogtreecommitdiff
path: root/vcl/source/window/status.cxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2009-12-11 13:49:58 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2009-12-11 13:49:58 +0100
commitaf24b66c7b07b21e0ef5268116d75e6c22b95c90 (patch)
tree4826d7b88f8368a29e17df24cd1cfabea56dc43b /vcl/source/window/status.cxx
parent0d1debd8e0179006d80f7f9ca443d21730f14dae (diff)
parentf8ada8f2a93659e27928f3b5244c813de2c3847b (diff)
merge with DEV300m67
Diffstat (limited to 'vcl/source/window/status.cxx')
-rw-r--r--vcl/source/window/status.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index a4c067061c30..8d986f691963 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1321,8 +1321,13 @@ void StatusBar::SetItemText( USHORT nItemId, const XubString& rText )
// adjust item width - see also DataChanged()
long nFudge = GetTextHeight()/4;
long nWidth = GetTextWidth( pItem->maText ) + nFudge;
- if( nWidth > pItem->mnWidth + STATUSBAR_OFFSET )
+ if( (nWidth > pItem->mnWidth + STATUSBAR_OFFSET) ||
+ ((nWidth < pItem->mnWidth) && (mnDX - STATUSBAR_OFFSET) < mnItemsWidth ))
+ {
pItem->mnWidth = nWidth + STATUSBAR_OFFSET;
+ ImplFormat();
+ Invalidate();
+ }
// Item neu Zeichen, wenn StatusBar sichtbar und
// UpdateMode gesetzt ist