cui/source/tabpages/tplnedef.cxx | 15 ++++++++++++--- sfx2/source/sidebar/SidebarController.cxx | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-)
New commits: commit 403356bcff58bd1a5c30081e450da0cc48d2ed2b Author: Caolán McNamara <[email protected]> AuthorDate: Fri Aug 9 12:18:53 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:18:08 2019 +0200 Resolves: tdf#126736 change range on change of unit and make the max % 800 instead of 500 while we're at it (0.15cm is considered 100% FWIW) when flipping from measurement unit to % Change-Id: Ia1b15559f3db0d1e11d4563ad7c6aacc3f9ba32d Reviewed-on: https://gerrit.libreoffice.org/77194 Tested-by: Jenkins Reviewed-by: Xisco Faulí <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77905 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 5d822005f8ba..dea7c0e3ba02 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -408,6 +408,11 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(weld::ToggleButton* p) m_xMtrLength2->set_unit(eFUnit); m_xMtrDistance->set_unit(eFUnit); + // tdf#126736 max 5cm + m_xMtrLength1->set_range(0, 500, FieldUnit::CM); + m_xMtrLength2->set_range(0, 500, FieldUnit::CM); + m_xMtrDistance->set_range(0, 500, FieldUnit::CM); + SetMetricValue( *m_xMtrLength1, nTmp1, ePoolUnit ); SetMetricValue( *m_xMtrLength2, nTmp2, ePoolUnit ); SetMetricValue( *m_xMtrDistance, nTmp3, ePoolUnit ); @@ -438,10 +443,14 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(weld::ToggleButton* p) m_xMtrLength2->set_unit(FieldUnit::PERCENT); m_xMtrDistance->set_unit(FieldUnit::PERCENT); - SetMetricValue( *m_xMtrLength1, nTmp1, ePoolUnit ); - SetMetricValue( *m_xMtrLength2, nTmp2, ePoolUnit ); - SetMetricValue( *m_xMtrDistance, nTmp3, ePoolUnit ); + // tdf#126736 800% + m_xMtrLength1->set_range(0, 800, FieldUnit::PERCENT); + m_xMtrLength2->set_range(0, 800, FieldUnit::PERCENT); + m_xMtrDistance->set_range(0, 800, FieldUnit::PERCENT); + m_xMtrLength1->set_value(nTmp1, FieldUnit::PERCENT); + m_xMtrLength2->set_value(nTmp2, FieldUnit::PERCENT); + m_xMtrDistance->set_value(nTmp3, FieldUnit::PERCENT); } SelectTypeHdl_Impl( nullptr ); } commit 8ff0ef8db7647b639aab4f78b2180be8a5226bc2 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Aug 8 16:35:36 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:17:57 2019 +0200 tdf#126769 Sidebar can't be collapsed clicking on the hide arrow Change-Id: I72ab41fb6c98ab548a1b3cfce837ab9312c7df66 Reviewed-on: https://gerrit.libreoffice.org/77156 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 2812610f4f39ed5892da08864893c758325d1d39) Reviewed-on: https://gerrit.libreoffice.org/77326 Reviewed-by: Xisco Faulí <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77904 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ec900b75590e..2ed61d330c98 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -482,7 +482,8 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth) { // Deck became large enough to be shown. Show it. mnSavedSidebarWidth = nNewWidth; - RequestOpenDeck(); + if (!mbIsDeckOpen.get()) + RequestOpenDeck(); } else { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
