diff options
| author | Katarina Behrens <bubli@bubli.org> | 2013-07-31 20:54:00 +0200 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2013-07-31 21:02:27 +0200 |
| commit | 83ff6c0f4101fe4f25c2b4a58c70b40de8cc2ff2 (patch) | |
| tree | 71846cad355a9ac0db043f8550c9f0b2a3dbcde4 /sd | |
| parent | a90c2e73ea4788ee58e9dab2b0f44467306d67dd (diff) | |
sidebar: fix widget positioning when replacing controls
by introducing placeholder VclHBox
Sadly, I've been unable to do away w/ the original ugly code
that draws replacement widget over the original one :(
(SetPosPixel, SetZOrder etc.)
It is still being done, but now in correct position on screen.
Change-Id: I51bd1f411621081b42da25b52f1a4d6b56c1e7f6
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 2 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/customanimationspanel.ui | 13 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 347f960f612a..10bb39d29db6 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -174,6 +174,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas get(mpFTStart, "start_effect"); get(mpLBStart, "start_effect_list"); get(mpFTProperty, "effect_property"); + get(mpPlaceholderBox, "placeholder"); get(mpLBProperty, "effect_property_list"); get(mpPBPropertyMore, "more_properties"); @@ -538,7 +539,7 @@ void CustomAnimationPane::updateControls() pSubControl = mpLBProperty->getSubControl(); if( !pSubControl || (pSubControl->getControlType() != mnPropertyType) ) { - pSubControl = PropertySubControl::create( mnPropertyType, this, aValue, pEffect->getPresetId(), LINK( this, CustomAnimationPane, implPropertyHdl ) ); + pSubControl = PropertySubControl::create( mnPropertyType, mpPlaceholderBox, aValue, pEffect->getPresetId(), LINK( this, CustomAnimationPane, implPropertyHdl ) ); mpLBProperty->setSubControl( pSubControl ); } else diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index ed8cc569cc12..e00d3c50c589 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/frame/XModel.hpp> #include <vcl/dialog.hxx> +#include <vcl/layout.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <sfx2/sidebar/ControlFactory.hxx> #include "CustomAnimationPreset.hxx" @@ -133,6 +134,7 @@ private: FixedText* mpFTStart; ListBox* mpLBStart; FixedText* mpFTProperty; + VclHBox* mpPlaceholderBox; PropertyControl* mpLBProperty; PushButton* mpPBPropertyMore; FixedText* mpFTSpeed; diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 81f6b5e76a83..eb887ef29c8b 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -171,11 +171,18 @@ </packing> </child> <child> - <object class="sdlo-PropertyControl" id="effect_property_list"> + <object class="GtkBox" id="placeholder"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="spacing">6</property> + <child> + <object class="sdlo-PropertyControl" id="effect_property_list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> |