summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/slider.hxx1
-rw-r--r--include/vcl/status.hxx3
-rw-r--r--svx/source/stbctrls/modctrl.cxx3
-rw-r--r--svx/source/stbctrls/pszctrl.cxx3
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx3
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx3
-rw-r--r--sw/source/uibase/utlui/viewlayoutctrl.cxx3
-rw-r--r--vcl/inc/listbox.hxx1
-rw-r--r--vcl/source/control/imp_listbox.cxx35
-rw-r--r--vcl/source/control/slider.cxx8
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx8
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx1
-rw-r--r--vcl/source/window/status.cxx106
13 files changed, 61 insertions, 117 deletions
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index cc4919b58fea..6549b4c0ac54 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -48,7 +48,6 @@ private:
sal_uInt16 mnStateFlags;
ScrollType meScrollType;
bool mbCalcSize;
- bool mbFullDrag;
bool mbScrollTypeSet;
VclPtr<NumericField> mpLinkedField;
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 1fe0935fc622..bbd270cc4f88 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -75,7 +75,6 @@ private:
sal_uInt16 mnCurItemId;
sal_uInt16 mnPercent;
sal_uInt16 mnPercentCount;
- bool mbVisibleItems;
bool mbFormat;
bool mbProgressMode;
bool mbInUserDraw;
@@ -129,8 +128,6 @@ public:
void HideItem( sal_uInt16 nItemId );
bool IsItemVisible( sal_uInt16 nItemId ) const;
- bool AreItemsVisible() const { return mbVisibleItems; }
-
void RedrawItem( sal_uInt16 nItemId );
void Clear();
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index b7d92a7063da..81711ff62232 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -111,8 +111,7 @@ IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer, void )
void SvxModifyControl::_repaint()
{
- if ( GetStatusBar().AreItemsVisible() )
- GetStatusBar().SetItemData( GetId(), nullptr ); // force repaint
+ GetStatusBar().SetItemData( GetId(), nullptr ); // force repaint
}
/**
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 018f353a6021..98fce9a6bdba 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -327,8 +327,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
pImpl->bTable = false;
}
- if ( GetStatusBar().AreItemsVisible() )
- GetStatusBar().SetItemData( GetId(), nullptr );
+ GetStatusBar().SetItemData( GetId(), nullptr );
// set only strings as text at the statusBar, so that the Help-Tips
// can work with the text, when it is too long for the statusBar
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index be0763e6d9a8..4784739c7079 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -82,8 +82,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons
mpImpl->mnState = SignatureState::UNKNOWN;
}
- if( GetStatusBar().AreItemsVisible() ) // necessary ?
- GetStatusBar().SetItemData( GetId(), nullptr );
+ GetStatusBar().SetItemData( GetId(), nullptr ); // necessary ?
GetStatusBar().SetItemText( GetId(), "" ); // necessary ?
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index a8afa60b4cb7..37254da36d50 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -383,8 +383,7 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
void SvxZoomSliderControl::forceRepaint() const
{
- if (GetStatusBar().AreItemsVisible())
- GetStatusBar().SetItemData(GetId(), nullptr);
+ GetStatusBar().SetItemData(GetId(), nullptr);
}
void SvxZoomSliderControl::repaintAndExecute()
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index caca9733bc7a..eadb17f748f1 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -81,8 +81,7 @@ void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState
mpImpl->mnState = 3;
}
- if ( GetStatusBar().AreItemsVisible() )
- GetStatusBar().SetItemData( GetId(), nullptr ); // force repaint
+ GetStatusBar().SetItemData( GetId(), nullptr ); // force repaint
}
void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 5dc4e3098c52..d6f654d4a388 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -198,7 +198,6 @@ private:
sal_Int32 mnTop; ///< output from line on
long mnLeft; ///< output from column on
- long mnBorder; ///< distance border - text
long mnTextHeight; ///< text height
ProminentEntry meProminentType; ///< where is the "prominent" entry
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 4d3cffb99e1c..6433c49c3bd7 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -48,6 +48,8 @@
using namespace ::com::sun::star;
+static constexpr long gnBorder = 1;
+
void ImplInitDropDownButton( PushButton* pButton )
{
pButton->SetSymbol( SymbolType::SPIN_DOWN );
@@ -479,7 +481,6 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle )
mnTop = 0;
mnLeft = 0;
- mnBorder = 1;
mnSelectModifier = 0;
mnUserDrawEntry = LISTBOX_ENTRY_NOTFOUND;
mbTrack = false;
@@ -555,7 +556,7 @@ void ImplListBoxWindow::ImplCalcMetrics()
mnMaxImgHeight = 0;
mnTextHeight = static_cast<sal_uInt16>(GetTextHeight());
- mnMaxTxtHeight = mnTextHeight + mnBorder;
+ mnMaxTxtHeight = mnTextHeight + gnBorder;
mnMaxHeight = mnMaxTxtHeight;
if ( maUserItemSize.Height() > mnMaxHeight )
@@ -666,7 +667,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
if( aMetrics.nTextWidth > mnMaxTxtWidth )
mnMaxTxtWidth = aMetrics.nTextWidth;
aMetrics.nEntryWidth = mnMaxTxtWidth;
- aMetrics.nEntryHeight = aTextRect.GetHeight() + mnBorder;
+ aMetrics.nEntryHeight = aTextRect.GetHeight() + gnBorder;
}
else
{
@@ -677,7 +678,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
if( aMetrics.nTextWidth > mnMaxTxtWidth )
mnMaxTxtWidth = aMetrics.nTextWidth;
aMetrics.nEntryWidth = mnMaxTxtWidth;
- aMetrics.nEntryHeight = mnTextHeight + mnBorder;
+ aMetrics.nEntryHeight = mnTextHeight + gnBorder;
}
}
if ( aMetrics.bImage )
@@ -708,7 +709,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
{
// entries which have no (aka an empty) text, and no image,
// and are not user-drawn, should be shown nonetheless
- aMetrics.nEntryHeight = mnTextHeight + mnBorder;
+ aMetrics.nEntryHeight = mnTextHeight + gnBorder;
}
if ( aMetrics.nEntryWidth > mnMaxWidth )
@@ -811,7 +812,7 @@ void ImplListBoxWindow::ImplHideFocusRect()
sal_Int32 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
{
- long nY = mnBorder;
+ long nY = gnBorder;
sal_Int32 nSelect = mnTop;
const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nSelect );
@@ -1271,7 +1272,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
}
else
{
- nSelect = static_cast<sal_Int32>( ( aPt.Y() + mnBorder ) / mnMaxHeight ) + mnTop;
+ nSelect = static_cast<sal_Int32>( ( aPt.Y() + gnBorder ) / mnMaxHeight ) + mnTop;
nSelect = std::min( nSelect, GetLastVisibleEntry() );
nSelect = std::min( nSelect, static_cast<sal_Int32>( mpEntryList->GetEntryCount() - 1 ) );
}
@@ -1789,12 +1790,12 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32
if (!!aImage)
{
aImgSz = aImage.GetSizePixel();
- Point aPtImg(mnBorder - mnLeft, nY + ((pEntry->mnHeight - aImgSz.Height()) / 2));
+ Point aPtImg(gnBorder - mnLeft, nY + ((pEntry->mnHeight - aImgSz.Height()) / 2));
// pb: #106948# explicit mirroring for calc
if (mbMirroring)
// right aligned
- aPtImg.setX( mnMaxWidth + mnBorder - aImgSz.Width() - mnLeft );
+ aPtImg.setX( mnMaxWidth + gnBorder - aImgSz.Width() - mnLeft );
if (!IsZoom())
{
@@ -1830,12 +1831,12 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32
OUString aStr(mpEntryList->GetEntryText(nPos));
if (!aStr.isEmpty())
{
- long nMaxWidth = std::max(mnMaxWidth, GetOutputSizePixel().Width() - 2 * mnBorder);
+ long nMaxWidth = std::max(mnMaxWidth, GetOutputSizePixel().Width() - 2 * gnBorder);
// a multiline entry should only be as wide a the window
if (pEntry->mnFlags & ListBoxEntryFlags::MultiLine)
- nMaxWidth = GetOutputSizePixel().Width() - 2 * mnBorder;
+ nMaxWidth = GetOutputSizePixel().Width() - 2 * gnBorder;
- tools::Rectangle aTextRect(Point(mnBorder - mnLeft, nY),
+ tools::Rectangle aTextRect(Point(gnBorder - mnLeft, nY),
Size(nMaxWidth, pEntry->mnHeight));
if (!bDrawTextAtImagePos && (mpEntryList->HasEntryImage(nPos) || IsUserDrawEnabled()))
@@ -1848,7 +1849,7 @@ void ImplListBoxWindow::DrawEntry(vcl::RenderContext& rRenderContext, sal_Int32
if (mbMirroring)
{
// right aligned
- aTextRect.SetLeft( nMaxWidth + mnBorder - rRenderContext.GetTextWidth(aStr) - mnLeft );
+ aTextRect.SetLeft( nMaxWidth + gnBorder - rRenderContext.GetTextWidth(aStr) - mnLeft );
if (aImgSz.Width() > 0)
aTextRect.AdjustLeft( -(aImgSz.Width() + IMG_TXT_DISTANCE) );
}
@@ -1891,8 +1892,8 @@ void ImplListBoxWindow::ImplDoPaint(vcl::RenderContext& rRenderContext, const to
if (mbHasFocusRect)
ImplHideFocusRect();
- long nY = 0; // + mnBorder;
- long nHeight = GetOutputSizePixel().Height();// - mnMaxHeight + mnBorder;
+ long nY = 0; // + gnBorder;
+ long nHeight = GetOutputSizePixel().Height();// - mnMaxHeight + gnBorder;
for (sal_Int32 i = mnTop; i < nCount && nY < nHeight + mnMaxHeight; i++)
{
@@ -1923,7 +1924,7 @@ sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const
// FIXME: ListBoxEntryFlags::MultiLine
const sal_Int32 nCount = mpEntryList->GetEntryCount()-mnTop;
- long nHeight = GetOutputSizePixel().Height();// - mnMaxHeight + mnBorder;
+ long nHeight = GetOutputSizePixel().Height();// - mnMaxHeight + gnBorder;
sal_uInt16 nEntries = static_cast< sal_uInt16 >( ( nHeight + mnMaxHeight - 1 ) / mnMaxHeight );
if( nEntries > nCount )
nEntries = static_cast<sal_uInt16>(nCount);
@@ -2077,7 +2078,7 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const
Size aSz;
aSz.setHeight( nMaxLines * mnMaxHeight );
- aSz.setWidth( mnMaxWidth + 2*mnBorder );
+ aSz.setWidth( mnMaxWidth + 2*gnBorder );
return aSz;
}
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index ae98f27cec0b..507657a22aa5 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -56,7 +56,6 @@ void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnStateFlags = 0;
meScrollType = ScrollType::DontKnow;
mbCalcSize = true;
- mbFullDrag = true;
mbScrollTypeSet = false;
mpLinkedField = nullptr;
@@ -704,11 +703,6 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
// after dragging, recalculate to a rounded Thumb position
ImplCalc();
Update();
-
- if ( !mbFullDrag && (mnStartPos != mnThumbPos) )
- {
- Slide();
- }
}
EndSlide();
@@ -742,7 +736,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
ImplUpdateRects();
Update();
ImplUpdateLinkedField();
- if ( mbFullDrag && (nOldPos != mnThumbPos) )
+ if ( nOldPos != mnThumbPos )
{
Slide();
}
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index b0d40068f412..9ba9c2b91161 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -144,7 +144,6 @@ WMFWriter::WMFWriter()
, nActRecordPos(0)
, eSrcRasterOp(RasterOp::OverPaint)
, eSrcTextAlign(ALIGN_BASELINE)
- , bSrcIsClipping(false)
, pAttrStack(nullptr)
, eSrcHorTextAlign(W_TA_LEFT)
, eDstROP2(RasterOp::OverPaint)
@@ -928,9 +927,8 @@ void WMFWriter::SetLineAndFillAttr()
aDstFillColor = aSrcFillColor;
CreateSelectDeleteBrush( aDstFillColor );
}
- if ( bDstIsClipping != bSrcIsClipping ||
- (bSrcIsClipping && aDstClipRegion!=aSrcClipRegion)) {
- bDstIsClipping=bSrcIsClipping;
+ if ( bDstIsClipping ) {
+ bDstIsClipping=false;
aDstClipRegion=aSrcClipRegion;
}
}
@@ -1765,7 +1763,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
CreateSelectDeleteBrush( aDstFillColor );
aDstClipRegion = aSrcClipRegion = vcl::Region();
- bDstIsClipping = bSrcIsClipping = false;
+ bDstIsClipping = false;
vcl::Font aFont;
aFont.SetCharSet( GetExtendedTextEncoding( RTL_TEXTENCODING_MS_1252 ) );
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index a3f4885d1706..8ae1f7547ff5 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -75,7 +75,6 @@ private:
FontAlign eSrcTextAlign;
vcl::Font aSrcFont;
MapMode aSrcMapMode;
- bool bSrcIsClipping;
vcl::Region aSrcClipRegion;
WMFWriterAttrStackMember * pAttrStack;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 0ad3226ed0de..aeaa0e9c86e6 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -50,13 +50,11 @@ public:
VclPtr<VirtualDevice> mpVirDev;
long mnItemBorderWidth;
- bool mbDrawItemFrames:1;
};
StatusBar::ImplData::ImplData()
{
mpVirDev = nullptr;
- mbDrawItemFrames = false;
mnItemBorderWidth = 0;
}
@@ -105,7 +103,7 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize,
bool StatusBar::ImplIsItemUpdate()
{
- return !mbProgressMode && mbVisibleItems && IsReallyVisible() && IsUpdateMode();
+ return !mbProgressMode && IsReallyVisible() && IsUpdateMode();
}
void StatusBar::ImplInit( vcl::Window* pParent, WinBits nStyle )
@@ -122,7 +120,6 @@ void StatusBar::ImplInit( vcl::Window* pParent, WinBits nStyle )
mpImplData->mpVirDev = VclPtr<VirtualDevice>::Create( *this );
mnCurItemId = 0;
mbFormat = true;
- mbVisibleItems = true;
mbProgressMode = false;
mbInUserDraw = false;
mbAdjustHiDPI = false;
@@ -356,7 +353,7 @@ void StatusBar::ImplDrawText(vcl::RenderContext& rRenderContext)
tools::Rectangle aTextRect;
aTextRect.SetLeft( STATUSBAR_OFFSET_X + 1 );
aTextRect.SetTop( mnTextY );
- if (mbVisibleItems && (GetStyle() & WB_RIGHT))
+ if (GetStyle() & WB_RIGHT)
aTextRect.SetRight( mnDX - mnItemsWidth - 1 );
else
aTextRect.SetRight( mnDX - 1 );
@@ -456,23 +453,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen
else
rRenderContext.SetClipRegion();
- // show frame
- if (mpImplData->mbDrawItemFrames)
- {
- if (!(pItem->mnBits & StatusBarItemBits::Flat))
- {
- DrawFrameStyle nStyle;
-
- if (pItem->mnBits & StatusBarItemBits::In)
- nStyle = DrawFrameStyle::In;
- else
- nStyle = DrawFrameStyle::Out;
-
- DecorationView aDecoView(&rRenderContext);
- aDecoView.DrawFrame(aRect, nStyle);
- }
- }
- else if (nPos != ImplGetFirstVisiblePos())
+ if (nPos != ImplGetFirstVisiblePos())
{
// draw separator
Point aFrom(aRect.TopLeft());
@@ -682,27 +663,24 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
// trigger toolbox only for left mouse button
if ( rMEvt.IsLeft() )
{
- if ( mbVisibleItems )
- {
- Point aMousePos = rMEvt.GetPosPixel();
+ Point aMousePos = rMEvt.GetPosPixel();
- // search for clicked item
- for ( size_t i = 0; i < mvItemList.size(); ++i )
+ // search for clicked item
+ for ( size_t i = 0; i < mvItemList.size(); ++i )
+ {
+ ImplStatusItem* pItem = mvItemList[ i ].get();
+ // check item for being clicked
+ if ( ImplGetItemRectPos( sal_uInt16(i) ).IsInside( aMousePos ) )
{
- ImplStatusItem* pItem = mvItemList[ i ].get();
- // check item for being clicked
- if ( ImplGetItemRectPos( sal_uInt16(i) ).IsInside( aMousePos ) )
- {
- mnCurItemId = pItem->mnId;
- if ( rMEvt.GetClicks() == 2 )
- DoubleClick();
- else
- Click();
- mnCurItemId = 0;
-
- // Item found
- return;
- }
+ mnCurItemId = pItem->mnId;
+ if ( rMEvt.GetClicks() == 2 )
+ DoubleClick();
+ else
+ Click();
+ mnCurItemId = 0;
+
+ // Item found
+ return;
}
}
@@ -739,28 +717,26 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
else
{
// draw text
- if (!mbVisibleItems || (GetStyle() & WB_RIGHT))
+ if (GetStyle() & WB_RIGHT)
ImplDrawText(rRenderContext);
// draw items
- if (mbVisibleItems)
- {
- // Do offscreen only when we are not recording layout..
- bool bOffscreen = !rRenderContext.ImplIsRecordLayout();
- // tdf#94213 - un-necessary virtual-device in GL mode
- // causes context switch & hence flicker during sizing.
+ // Do offscreen only when we are not recording layout..
+ bool bOffscreen = !rRenderContext.ImplIsRecordLayout();
+
+ // tdf#94213 - un-necessary virtual-device in GL mode
+ // causes context switch & hence flicker during sizing.
#if HAVE_FEATURE_OPENGL
- if( OpenGLWrapper::isVCLOpenGLEnabled() )
- bOffscreen = false;
+ if( OpenGLWrapper::isVCLOpenGLEnabled() )
+ bOffscreen = false;
#endif
- if (!bOffscreen)
- rRenderContext.Erase(rRect);
+ if (!bOffscreen)
+ rRenderContext.Erase(rRect);
- for (sal_uInt16 i = 0; i < nItemCount; i++)
- ImplDrawItem(rRenderContext, bOffscreen, i);
- }
+ for (sal_uInt16 i = 0; i < nItemCount; i++)
+ ImplDrawItem(rRenderContext, bOffscreen, i);
}
// draw line at the top of the status bar (to visually distinguish it from
@@ -1080,7 +1056,7 @@ sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const
sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const
{
- if ( AreItemsVisible() && !mbFormat )
+ if ( !mbFormat )
{
sal_uInt16 nItemCount = GetItemCount();
sal_uInt16 nPos;
@@ -1100,7 +1076,7 @@ tools::Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const
{
tools::Rectangle aRect;
- if ( AreItemsVisible() && !mbFormat )
+ if ( !mbFormat )
{
sal_uInt16 nPos = GetItemPos( nItemId );
if ( nPos != STATUSBAR_ITEM_NOTFOUND )
@@ -1425,7 +1401,7 @@ void StatusBar::EndProgressMode()
void StatusBar::SetText(const OUString& rText)
{
- if ((!mbVisibleItems || (GetStyle() & WB_RIGHT)) && !mbProgressMode && IsReallyVisible() && IsUpdateMode())
+ if ((GetStyle() & WB_RIGHT) && !mbProgressMode && IsReallyVisible() && IsUpdateMode())
{
if (mbFormat)
{
@@ -1487,20 +1463,6 @@ Size StatusBar::CalcWindowSizePixel() const
}
}
- if( mpImplData->mbDrawItemFrames &&
- IsNativeControlSupported( ControlType::Frame, ControlPart::Border ) )
- {
- ImplControlValue aControlValue( static_cast<long>(DrawFrameFlags::NoDraw) );
- tools::Rectangle aBound, aContent;
- tools::Rectangle aNatRgn( Point( 0, 0 ), Size( 150, 50 ) );
- if( GetNativeControlRegion(ControlType::Frame, ControlPart::Border,
- aNatRgn, ControlState::NONE, aControlValue, aBound, aContent) )
- {
- mpImplData->mnItemBorderWidth =
- ( aBound.GetHeight() - aContent.GetHeight() ) / 2;
- }
- }
-
nCalcHeight = nMinHeight+nBarTextOffset + 2*mpImplData->mnItemBorderWidth;
if( nCalcHeight < nProgressHeight+2 )
nCalcHeight = nProgressHeight+2;
generated by cgit (git 2.34.1) at 2024-06-16 06:56:45 +0000