Skip to content

C
core
Kaydet (Commit) 0359a59b authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

forward RenderCOntext to UserDraw, remove obsolete draw call 

Change-Id: I29dcc22a6840e7104bdf68d050b616c8e06226fa
üst dd0996f7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
vcl/source/window/status.cxx
Dosyayı görüntüle @ 0359a59b
...@@ -462,7 +462,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen ...@@ -462,7 +462,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen
} }
else else
{ {
UserDrawEvent aODEvt(this, aTextRect, pItem->mnId); UserDrawEvent aODEvt(&rRenderContext, aTextRect, pItem->mnId);
UserDraw(aODEvt); UserDraw(aODEvt);
} }
} }
...@@ -505,8 +505,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen ...@@ -505,8 +505,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen
} }
} }
const OutputDevice* pOutDev = GetOutDev(); if (!rRenderContext.ImplIsRecordLayout())
if (!pOutDev->ImplIsRecordLayout())
CallEventListeners(VCLEVENT_STATUSBAR_DRAWITEM, reinterpret_cast<void*>(pItem->mnId)); CallEventListeners(VCLEVENT_STATUSBAR_DRAWITEM, reinterpret_cast<void*>(pItem->mnId));
} }
...@@ -1260,7 +1259,6 @@ void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData ) ...@@ -1260,7 +1259,6 @@ void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData )
Update(); Update();
Rectangle aRect = ImplGetItemRectPos(nPos); Rectangle aRect = ImplGetItemRectPos(nPos);
Invalidate(aRect); Invalidate(aRect);
ImplDrawItem(*this, true, nPos, false, false);
Flush(); Flush();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment