Skip to content

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

Fix Button when using double-buffered rendering 

Change-Id: Ib2812723141c5dfe39b30c95f12d1aeca9c367bd
üst 85b7494e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
vcl/source/control/button.cxx
Dosyayı görüntüle @ 9c08a06f
...@@ -951,9 +951,9 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa ...@@ -951,9 +951,9 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa
break; break;
} }
bool bDropDown = ( IsSymbol() && (GetSymbol()==SymbolType::SPIN_DOWN) && GetText().isEmpty() ); bool bDropDown = (IsSymbol() && (GetSymbol() == SymbolType::SPIN_DOWN) && GetText().isEmpty());
if( bDropDown && (aCtrlType == CTRL_COMBOBOX || aCtrlType == CTRL_LISTBOX ) ) if( bDropDown && (aCtrlType == CTRL_COMBOBOX || aCtrlType == CTRL_LISTBOX))
{ {
if (GetParent()->IsNativeControlSupported(aCtrlType, PART_ENTIRE_CONTROL)) if (GetParent()->IsNativeControlSupported(aCtrlType, PART_ENTIRE_CONTROL))
{ {
...@@ -1007,7 +1007,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa ...@@ -1007,7 +1007,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa
if (!bRollOver && !HasFocus()) if (!bRollOver && !HasFocus())
bDrawMenuSep = false; bDrawMenuSep = false;
} }
if ((bNativeOK = IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL))) if ((bNativeOK = rRenderContext.IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)))
{ {
PushButtonValue aControlValue; PushButtonValue aControlValue;
Rectangle aCtrlRegion(aInRect); Rectangle aCtrlRegion(aInRect);
...@@ -1045,8 +1045,8 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa ...@@ -1045,8 +1045,8 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa
// prepare single line hint (needed on mac to decide between normal push button and // prepare single line hint (needed on mac to decide between normal push button and
// rectangular bevel button look) // rectangular bevel button look)
Size aFontSize(Application::GetSettings().GetStyleSettings().GetPushButtonFont().GetSize()); Size aFontSize(Application::GetSettings().GetStyleSettings().GetPushButtonFont().GetSize());
aFontSize = LogicToPixel(aFontSize, MapMode(MAP_POINT)); aFontSize = rRenderContext.LogicToPixel(aFontSize, MapMode(MAP_POINT));
Size aInRectSize(LogicToPixel(Size(aInRect.GetWidth(), aInRect.GetHeight()))); Size aInRectSize(rRenderContext.LogicToPixel(Size(aInRect.GetWidth(), aInRect.GetHeight())));
aControlValue.mbSingleLine = (aInRectSize.Height() < 2 * aFontSize.Height()); aControlValue.mbSingleLine = (aInRectSize.Height() < 2 * aFontSize.Height());
if (((nState & ControlState::ROLLOVER)) || !(GetStyle() & WB_FLATBUTTON)) if (((nState & ControlState::ROLLOVER)) || !(GetStyle() & WB_FLATBUTTON))
...@@ -1060,7 +1060,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa ...@@ -1060,7 +1060,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext, bool bLa
} }
// draw content using the same aInRect as non-native VCL would do // draw content using the same aInRect as non-native VCL would do
ImplDrawPushButtonContent(this, (nState&ControlState::ROLLOVER) ? WINDOW_DRAW_ROLLOVER : 0, ImplDrawPushButtonContent(&rRenderContext, (nState&ControlState::ROLLOVER) ? WINDOW_DRAW_ROLLOVER : 0,
aInRect, bLayout, bDrawMenuSep); aInRect, bLayout, bDrawMenuSep);
if (HasFocus()) if (HasFocus())
......
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