diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-08-27 10:54:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-09 18:42:26 +0100 |
| commit | 84b836c575ad849d51e5a5d4ac58b64dc5b99443 (patch) | |
| tree | cec65f4da977e01bcb83017d02504ae9632db84d /vcl | |
| parent | 11e5d5177fbaf86590a690a6189eafab0f25083c (diff) | |
vcl: simplify ControlDrawParameters construction, add nValue
Don't require eButtonValue as a constructor parameter as it mostly
isn't necessary and required.
In addition add nValue instance variable.
Change-Id: I927714f715fce1549d87cec633330a0dc313f569
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/CustomWidgetDraw.cxx | 12 | ||||
| -rw-r--r-- | vcl/inc/WidgetThemeLibrary.hxx | 7 |
2 files changed, 9 insertions, 10 deletions
diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx index e403d429bbb0..eaf1c3cae53a 100644 --- a/vcl/headless/CustomWidgetDraw.cxx +++ b/vcl/headless/CustomWidgetDraw.cxx @@ -72,7 +72,7 @@ bool CustomWidgetDraw::drawNativeControl(ControlType eType, ControlPart ePart, bool bOK = false; - ControlDrawParameters aParameters{ pCairoContext, ePart, eState, ButtonValue::DontKnow }; + ControlDrawParameters aParameters{ pCairoContext, ePart, eState }; switch (eType) { @@ -134,8 +134,7 @@ bool CustomWidgetDraw::drawNativeControl(ControlType eType, ControlPart ePart, ControlPart downBtnPart = pSpinVal->mnLowerPart; ControlState downBtnState = pSpinVal->mnLowerState; { - ControlDrawParameters aParametersUp{ pCairoContext, upBtnPart, upBtnState, - ButtonValue::DontKnow }; + ControlDrawParameters aParametersUp{ pCairoContext, upBtnPart, upBtnState }; cairo_save(pCairoContext); cairo_translate(pCairoContext, pSpinVal->maUpperRect.Left() - rControlRegion.Left(), @@ -148,8 +147,8 @@ bool CustomWidgetDraw::drawNativeControl(ControlType eType, ControlPart ePart, if (bOK) { - ControlDrawParameters aParametersDown{ pCairoContext, downBtnPart, downBtnState, - ButtonValue::DontKnow }; + ControlDrawParameters aParametersDown{ pCairoContext, downBtnPart, + downBtnState }; cairo_save(pCairoContext); cairo_translate(pCairoContext, pSpinVal->maLowerRect.Left() - rControlRegion.Left(), @@ -207,8 +206,7 @@ bool CustomWidgetDraw::drawNativeControl(ControlType eType, ControlPart ePart, const SliderValue* pSliderValue = static_cast<const SliderValue*>(&rValue); ControlDrawParameters aParametersButton{ pCairoContext, ControlPart::Button, - eState | pSliderValue->mnThumbState, - ButtonValue::DontKnow }; + eState | pSliderValue->mnThumbState }; cairo_save(pCairoContext); cairo_translate(pCairoContext, pSliderValue->maThumbRect.Left() - rControlRegion.Left(), diff --git a/vcl/inc/WidgetThemeLibrary.hxx b/vcl/inc/WidgetThemeLibrary.hxx index b4e78c7e515d..c99b2799b02f 100644 --- a/vcl/inc/WidgetThemeLibrary.hxx +++ b/vcl/inc/WidgetThemeLibrary.hxx @@ -19,12 +19,12 @@ namespace vcl { struct ControlDrawParameters { - ControlDrawParameters(cairo_t* i_pCairo, ControlPart i_ePart, ControlState i_eState, - ButtonValue i_eButtonValue) + ControlDrawParameters(cairo_t* i_pCairo, ControlPart i_ePart, ControlState i_eState) : pCairo(i_pCairo) , ePart(i_ePart) , eState(i_eState) - , eButtonValue(i_eButtonValue) + , eButtonValue(ButtonValue::DontKnow) + , nValue(0) { } @@ -32,6 +32,7 @@ struct ControlDrawParameters ControlPart ePart; ControlState eState; ButtonValue eButtonValue; + sal_Int64 nValue; }; class SAL_DLLPUBLIC_RTTI WidgetThemeLibrary |