summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorSumit Chauhan <sumitcn25@gmail.com>2019-02-09 13:16:50 +0530
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-07-15 01:16:24 +0200
commit6d3dfe83c82860c0688fd8c8dcc250402df53c74 (patch)
tree7b694b890b09785b6de67218d2d0d78bb50cc690 /svx
parent4cefa7ad283e2969cc6c4a2f889f5dc063914dba (diff)
tdf#120495 Providing self adapting height to the Area section of Sidebar
This problem comes when we switch between different fill tabs in area sidebar and this patch solves the issue. Change-Id: I09936e600214394d26a27d26d47be3ef9942b65f Reviewed-on: https://gerrit.libreoffice.org/67577 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 347afce3a997291313fd88843ba248ccbbcb3990) Reviewed-on: https://gerrit.libreoffice.org/75483 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx18
1 files changed, 18 insertions, 0 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 4c7a15c9f9a9..348babec99d8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -104,6 +104,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
get(mpLbFillGradTo, "fillgrad2");
get(mpGradientStyle, "gradientstyle");
get(mpBmpImport, "bmpimport");
+ mpPanel = dynamic_cast<sfx2::sidebar::Panel*>(pParent);
Initialize();
}
@@ -130,6 +131,7 @@ void AreaPropertyPanelBase::dispose()
mpLbFillGradTo.clear();
mpGradientStyle.clear();
mpBmpImport.clear();
+ mpPanel.clear();
PanelLayout::dispose();
}
@@ -440,6 +442,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void)
{
mpLbFillType->Selected();
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillColorHdl, SvxColorListBox&, void)
@@ -602,6 +606,8 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl()
break;
}
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
void AreaPropertyPanelBase::ImpUpdateTransparencies()
@@ -857,6 +863,8 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefaultOrSet,
mpToolBoxColor->Hide();
meLastXFS = static_cast<sal_uInt16>(-1);
mpStyleItem.reset();
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -896,6 +904,8 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSe
mpLbFillGradTo->SetNoSelection();
}
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -927,6 +937,8 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet,
mpLbFillAttr->SetNoSelection();
}
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -944,6 +956,8 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolIte
mpLbFillType->SelectEntryPos(SOLID);
Update();
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet, const SfxPoolItem* pState)
@@ -977,6 +991,8 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet,
mpLbFillAttr->SetNoSelection();
}
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
void AreaPropertyPanelBase::NotifyItemUpdate(
@@ -1243,6 +1259,8 @@ void AreaPropertyPanelBase::Update()
OSL_ENSURE(false, "Non supported FillType (!)");
break;
}
+ if(mpPanel)
+ mpPanel->TriggerDeckLayouting();
}
IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void)