From 61675fae14254794dfefba1e29fb2e124705a2b6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 26 Feb 2021 12:17:06 +0000 Subject: don't need to check if IsFloatingMode is true MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit seeing as... commit a5dbc997bff8f7fe61ddc848f48c880a6e67e448 Date: Thu Feb 25 11:38:02 2021 +0000 drop archaic rollable support assumes !IsRollUp is always true Change-Id: I707a8d93e3c74b049ab9b96b27ed17fb0d896098 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111628 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- svx/source/engine3d/float3d.cxx | 73 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 38 deletions(-) (limited to 'svx') diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index c16ec0e1e2fc..f789792f3420 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2150,49 +2150,46 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) void Svx3DWin::Resize() { - if (!IsFloatingMode()) + Size aWinSize( GetOutputSizePixel() ); // why rSize in Resizing()? + + if( aWinSize.Height() >= GetMinOutputSizePixel().Height() && + aWinSize.Width() >= GetMinOutputSizePixel().Width() ) { - Size aWinSize( GetOutputSizePixel() ); // why rSize in Resizing()? + // Hide + m_xBtnUpdate->hide(); + m_xBtnAssign->hide(); - if( aWinSize.Height() >= GetMinOutputSizePixel().Height() && - aWinSize.Width() >= GetMinOutputSizePixel().Width() ) - { - // Hide - m_xBtnUpdate->hide(); - m_xBtnAssign->hide(); + m_xBtnConvertTo3D->hide(); + m_xBtnLatheObject->hide(); + m_xBtnPerspective->hide(); - m_xBtnConvertTo3D->hide(); - m_xBtnLatheObject->hide(); - m_xBtnPerspective->hide(); + m_xCtlPreview->Hide(); + m_xLightPreviewGrid->hide(); - m_xCtlPreview->Hide(); - m_xLightPreviewGrid->hide(); + m_xFLGeometrie->hide(); + m_xFLRepresentation->hide(); + m_xFLLight->hide(); + m_xFLTexture->hide(); + m_xFLMaterial->hide(); - m_xFLGeometrie->hide(); - m_xFLRepresentation->hide(); - m_xFLLight->hide(); - m_xFLTexture->hide(); - m_xFLMaterial->hide(); - - // Show - m_xBtnUpdate->show(); - m_xBtnAssign->show(); - - m_xBtnConvertTo3D->show(); - m_xBtnLatheObject->show(); - m_xBtnPerspective->show(); - - if( m_xBtnGeo->get_active() ) - ClickViewTypeHdl(*m_xBtnGeo); - if( m_xBtnRepresentation->get_active() ) - ClickViewTypeHdl(*m_xBtnRepresentation); - if( m_xBtnLight->get_active() ) - ClickViewTypeHdl(*m_xBtnLight); - if( m_xBtnTexture->get_active() ) - ClickViewTypeHdl(*m_xBtnTexture); - if( m_xBtnMaterial->get_active() ) - ClickViewTypeHdl(*m_xBtnMaterial); - } + // Show + m_xBtnUpdate->show(); + m_xBtnAssign->show(); + + m_xBtnConvertTo3D->show(); + m_xBtnLatheObject->show(); + m_xBtnPerspective->show(); + + if( m_xBtnGeo->get_active() ) + ClickViewTypeHdl(*m_xBtnGeo); + if( m_xBtnRepresentation->get_active() ) + ClickViewTypeHdl(*m_xBtnRepresentation); + if( m_xBtnLight->get_active() ) + ClickViewTypeHdl(*m_xBtnLight); + if( m_xBtnTexture->get_active() ) + ClickViewTypeHdl(*m_xBtnTexture); + if( m_xBtnMaterial->get_active() ) + ClickViewTypeHdl(*m_xBtnMaterial); } SfxDockingWindow::Resize(); -- cgit