LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-26 15:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

tdf#130857 svx Svx3DWin: Stop relying on weld::ToggleButton indeterminate state

Browse Source 
Stop relying on weld::ToggleButton supporting
TRISTATE_INDET in the TriStateToggleButton helper
class, but instead introduce TriStateToggleButton::m_bIndeterminate
to explicitly get/set that state in the helper class
to indicate a "no real value set" state,
in preparation of removing support for TRISTATE_INDET
from weld::ToggleButton in an upcoming commit.

See also previous commit

    Change-Id: I4b39f941fdda886390079a00aed4c2ce29be5a43
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Thu Jul 17 10:31:06 2025 +0200

        svx: Extract TriStateToggleButton base from LightButton

for more background.

No change in behavior intended/expected for that
dialog, but (independent of this change) I didn't see
this "indeterminate" code path being taken in practice in
a quick test of that dialog started as follows:

* start Impress
* enable "View" -> "Toolbars" -> "3D-Objects"
* click on any object in the toolbar (e.g. "Cube")
  and insert it into the slide
* right-click on the object and select the
  "3D Dffects" context menu entry

Change-Id: Ib781e9108d526f90282a203b53065111a9d12236
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188001
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2025-07-17 11:14:01 +02:00
parent 4c9666acb9
commit 01fe1b0b03
2 changed files with 40 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/svx/float3d.hxx
View File

@ -52,11 +52,15 @@ class UNLESS_MERGELIBS(SVX_DLLPUBLIC) TriStateToggleButton
{
public:
explicit TriStateToggleButton(std::unique_ptr<weld::ToggleButton> xButton);
bool get_active() const { return m_xButton->get_active(); }
void set_active(bool bActive) { m_xButton->set_active(bActive); }
bool get_active() const { return m_xButton->get_active(); };
void set_active(bool bActive)
{
m_bIndeterminate = false;
m_xButton->set_active(bActive);
}
TriState get_state() const { return m_xButton->get_state(); }
void set_state(TriState eState) { m_xButton->set_state(eState); }
bool is_indeterminate() { return m_bIndeterminate; };
void set_indeterminate() { m_bIndeterminate = true; };
weld::ToggleButton* get_widget() const { return m_xButton.get(); }
@ -67,6 +71,7 @@ public:
private:
std::unique_ptr<weld::ToggleButton> m_xButton;
bool m_bIndeterminate = false;
};
class UNLESS_MERGELIBS(SVX_DLLPUBLIC) LightButton final : public TriStateToggleButton

87
svx/source/engine3d/float3d.cxx
View File

@ -491,14 +491,14 @@ void Svx3DWin::UpdateLight(const SfxItemSet& rAttrs, TypedWhichId<SvxColorItem>
rLightButton.switchLightOn(bOn);
bUpdate = true;
}
if (rLightButton.get_state() == TRISTATE_INDET)
if (rLightButton.is_indeterminate())
rLightButton.set_active(rLightButton.get_active());
}
else
{
if (rLightButton.get_state() != TRISTATE_INDET)
if (!rLightButton.is_indeterminate())
{
rLightButton.set_state(TRISTATE_INDET);
rLightButton.set_indeterminate();
bUpdate = true;
}
}
@ -522,14 +522,14 @@ void Svx3DWin::UpdateToggleButton(const SfxItemSet& rAttrs, TypedWhichId<SfxBool
rButton.set_active(bValue);
bUpdate = true;
}
else if (rButton.get_state() == TRISTATE_INDET)
else if (rButton.is_indeterminate())
rButton.set_active(bValue);
}
else
{
if (rButton.get_state() != TRISTATE_INDET)
if (!rButton.is_indeterminate())
{
rButton.set_state(TRISTATE_INDET);
rButton.set_indeterminate();
bUpdate = true;
}
}
@ -872,14 +872,14 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
m_xMtrSlant->set_sensitive( bValue );
bUpdate = true;
}
else if( m_xBtnShadow3d->get_state() == TRISTATE_INDET )
else if (m_xBtnShadow3d->is_indeterminate())
m_xBtnShadow3d->set_active( bValue );
}
else
{
if( m_xBtnShadow3d->get_state() != TRISTATE_INDET )
if (!m_xBtnShadow3d->is_indeterminate())
{
m_xBtnShadow3d->set_state( TRISTATE_INDET );
m_xBtnShadow3d->set_indeterminate();
bUpdate = true;
}
}
@ -1214,14 +1214,14 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
m_xBtnPerspective->set_active( ePT == ProjectionType::Perspective );
bUpdate = true;
}
if( m_xBtnPerspective->get_state() == TRISTATE_INDET )
if (m_xBtnPerspective->is_indeterminate())
m_xBtnPerspective->set_active( ePT == ProjectionType::Perspective );
}
else
{
if( m_xBtnPerspective->get_state() != TRISTATE_INDET )
if (!m_xBtnPerspective->is_indeterminate())
{
m_xBtnPerspective->set_state( TRISTATE_INDET );
m_xBtnPerspective->set_indeterminate();
bUpdate = true;
}
}
@ -1302,7 +1302,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
//Others must stand as the front on all sides
// Perspective
if( m_xBtnPerspective->get_state() != TRISTATE_INDET )
if (!m_xBtnPerspective->is_indeterminate())
{
ProjectionType nValue;
if( m_xBtnPerspective->get_active() )
@ -1354,12 +1354,8 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
rAttrs.InvalidateItem(SDRATTR_3DOBJ_DEPTH);
// Double-sided
TriState eState = m_xBtnDoubleSided->get_state();
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(makeSvx3DDoubleSidedItem(bValue));
}
if (!m_xBtnDoubleSided->is_indeterminate())
rAttrs.Put(makeSvx3DDoubleSidedItem(m_xBtnDoubleSided->get_active()));
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_DOUBLE_SIDED);
@ -1405,22 +1401,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_KIND);
// Normal inverted
eState = m_xBtnNormalsInvert->get_state();
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(makeSvx3DNormalsInvertItem(bValue));
}
if (!m_xBtnNormalsInvert->is_indeterminate())
rAttrs.Put(makeSvx3DNormalsInvertItem(m_xBtnNormalsInvert->get_active()));
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_INVERT);
// 2-sided lighting
eState = m_xBtnTwoSidedLighting->get_state();
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(makeSvx3DTwoSidedLightingItem(bValue));
}
if (!m_xBtnTwoSidedLighting->is_indeterminate())
rAttrs.Put(makeSvx3DTwoSidedLightingItem(m_xBtnTwoSidedLighting->get_active()));
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
@ -1435,10 +1423,9 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADE_MODE);
// 3D-Shadow
eState = m_xBtnShadow3d->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnShadow3d->is_indeterminate())
{
bool bValue = TRISTATE_TRUE == eState;
bool bValue = m_xBtnShadow3d->get_active();
rAttrs.Put(makeSvx3DShadow3DItem(bValue));
rAttrs.Put(makeSdrShadowItem(bValue));
}
@ -1488,8 +1475,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_1);
// Light 1 (on/off)
eState = m_xBtnLight1->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight1->is_indeterminate())
{
bool bValue = m_xBtnLight1->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff1Item(bValue));
@ -1513,8 +1499,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_2);
// Light 2 (on/off)
eState = m_xBtnLight2->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight2->is_indeterminate())
{
bool bValue = m_xBtnLight2->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff2Item(bValue));
@ -1537,8 +1522,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_3);
// Light 3 (on/off)
eState = m_xBtnLight3->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight3->is_indeterminate())
{
bool bValue = m_xBtnLight3->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff3Item(bValue));
@ -1561,8 +1545,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_4);
// Light 4 (on/off)
eState = m_xBtnLight4->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight4->is_indeterminate())
{
bool bValue = m_xBtnLight4->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff4Item(bValue));
@ -1585,8 +1568,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_5);
// Light 5 (on/off)
eState = m_xBtnLight5->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight5->is_indeterminate())
{
bool bValue = m_xBtnLight5->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff5Item(bValue));
@ -1609,8 +1591,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_6);
// Light 6 (on/off)
eState = m_xBtnLight6->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight6->is_indeterminate())
{
bool bValue = m_xBtnLight6->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff6Item(bValue));
@ -1633,8 +1614,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_7);
// Light 7 (on/off)
eState = m_xBtnLight7->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight7->is_indeterminate())
{
bool bValue = m_xBtnLight7->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff7Item(bValue));
@ -1657,8 +1637,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
else
rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_8);
// Light 8 (on/off)
eState = m_xBtnLight8->get_state();
if( eState != TRISTATE_INDET )
if (!m_xBtnLight8->is_indeterminate())
{
bool bValue = m_xBtnLight8->isLightOn();
rAttrs.Put(makeSvx3DLightOnOff8Item(bValue));
@ -1744,12 +1723,8 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Filter
eState = m_xBtnTexFilter->get_state();
if( eState != TRISTATE_INDET )
{
bool bValue = TRISTATE_TRUE == eState;
rAttrs.Put(makeSvx3DTextureFilterItem(bValue));
}
if (!m_xBtnTexFilter->is_indeterminate())
rAttrs.Put(makeSvx3DTextureFilterItem(m_xBtnTexFilter->get_active()));
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_TEXTURE_FILTER);