diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-04-03 21:59:37 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-03 17:10:03 +0200 |
| commit | 3e6b3d75a698e0c005c88f9e8ca86e7978a402a6 (patch) | |
| tree | 36827ef58d766e7572e2b2518d5eb23597c55ab2 | |
| parent | 649854544e28f388774492f27eb1b75485202148 (diff) | |
tdf#124155 fix slider for border and angle in gradient tab page
This is the consequence of the previous change, where the sliders
didn't respond to input when welded.
Change-Id: Ifec7fd913435a6ec51b93872c7a40d6815807397
Reviewed-on: https://gerrit.libreoffice.org/70198
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 4 | ||||
| -rw-r--r-- | cui/uiconfig/ui/gradientpage.ui | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 529ce2e8ce81..a8b505a5c68d 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -589,6 +589,7 @@ void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS ) m_xMtrCenterY->set_sensitive(false); m_xFtAngle->set_sensitive(true); m_xMtrAngle->set_sensitive(true); + m_xSliderAngle->set_sensitive(true); break; case css::awt::GradientStyle_RADIAL: @@ -597,6 +598,7 @@ void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS ) m_xMtrCenterY->set_sensitive(true); m_xFtAngle->set_sensitive(false); m_xMtrAngle->set_sensitive(false); + m_xSliderAngle->set_sensitive(false); break; case css::awt::GradientStyle_ELLIPTICAL: @@ -605,6 +607,7 @@ void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS ) m_xMtrCenterY->set_sensitive(true); m_xFtAngle->set_sensitive(true); m_xMtrAngle->set_sensitive(true); + m_xSliderAngle->set_sensitive(true); break; case css::awt::GradientStyle_SQUARE: @@ -614,6 +617,7 @@ void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS ) m_xMtrCenterY->set_sensitive(true); m_xFtAngle->set_sensitive(true); m_xMtrAngle->set_sensitive(true); + m_xSliderAngle->set_sensitive(true); break; default: break; diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index a3b3d751caf9..ba34727e60bc 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -25,6 +25,11 @@ <property name="upper">359</property> <property name="step_increment">15</property> </object> + <object class="GtkAdjustment" id="angleadjustmentslider"> + <property name="upper">359</property> + <property name="step_increment">15</property> + <property name="page_increment">15</property> + </object> <object class="GtkAdjustment" id="percentadjustment"> <property name="upper">100</property> <property name="step_increment">5</property> @@ -384,7 +389,6 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="adjustment">adjustment3</property> - <property name="fill_level">0</property> <property name="round_digits">1</property> <property name="draw_value">False</property> </object> @@ -521,8 +525,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="adjustment">angleadjustment</property> - <property name="fill_level">0</property> + <property name="adjustment">angleadjustmentslider</property> <property name="draw_value">False</property> </object> <packing> |