diff --git a/libreoffice-clipped-sidebar-paragraph-widget.patch b/libreoffice-clipped-sidebar-paragraph-widget.patch new file mode 100644 index 0000000..e8bcc41 --- /dev/null +++ b/libreoffice-clipped-sidebar-paragraph-widget.patch @@ -0,0 +1,189 @@ +From f8e8b0d1747e16394d43eec7a1ef2b33b5678619 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Tue, 30 Jun 2020 17:13:24 +0100 +Subject: [PATCH] tdf#134357 we can reduce the min toolbar sidebar width + +since, + +commit 754bea8c6a17889f9d4d23bf98847b6b67253220 +Date: Wed Apr 29 15:06:42 2020 +0100 + + remove the padding around the dropdown button of GtkMenuToolButtons + +the GtkMenuToolButton aren't as wide anymore so we don't need a min of 5 +GtkToolButtons widths for tdf#130197, now the max of either 4 GtkToolButtons or +that of 1 GtkToolButtons + 2 GtkMenuToolButton is sufficient + +Change-Id: I7296805b4b3c0d86ce3d08cadc8c2659104af619 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97502 +Tested-by: Jenkins +Reviewed-by: Adolfo Jayme Barrientos +--- + +diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx +index f63196c..75f9319 100644 +--- a/svx/source/dialog/dlgctrl.cxx ++++ b/svx/source/dialog/dlgctrl.cxx +@@ -1446,9 +1446,11 @@ + // use the, filled-in by dispatcher, width of measurewidth as the width + // of a "standard" column in a two column panel + std::unique_ptr xBuilder(Application::CreateBuilder(&rToolbar, "svx/ui/measurewidthbar.ui")); +- std::unique_ptr xToolbar(xBuilder->weld_toolbar("measurewidth")); +- std::unique_ptr xDispatcher(new ToolbarUnoDispatcher(*xToolbar, *xBuilder, rFrame)); +- nColumnWidth = xToolbar->get_preferred_size().Width(); ++ std::unique_ptr xToolbar1(xBuilder->weld_toolbar("measurewidth1")); ++ std::unique_ptr xDispatcher1(new ToolbarUnoDispatcher(*xToolbar1, *xBuilder, rFrame)); ++ std::unique_ptr xToolbar2(xBuilder->weld_toolbar("measurewidth2")); ++ std::unique_ptr xDispatcher2(new ToolbarUnoDispatcher(*xToolbar2, *xBuilder, rFrame)); ++ nColumnWidth = std::max(xToolbar1->get_preferred_size().Width(), xToolbar2->get_preferred_size().Width()); + eSize = rToolbar.get_icon_size(); + } + rToolbar.set_size_request(nColumnWidth, -1); +diff --git a/svx/uiconfig/ui/measurewidthbar.ui b/svx/uiconfig/ui/measurewidthbar.ui +index ad96cc7..b901963 100644 +--- a/svx/uiconfig/ui/measurewidthbar.ui ++++ b/svx/uiconfig/ui/measurewidthbar.ui +@@ -1,5 +1,5 @@ + +- ++ + + + +@@ -7,65 +7,43 @@ + False + vertical + +- ++ + True + False + icons + False + 2 + +- ++ + True + False + True + + + False +- True ++ False + + + +- ++ + True + False + True + + + False +- True ++ False + + + +- ++ + True + False + True + + + False +- True +- +- +- +- +- True +- False +- True +- +- +- False +- True +- +- +- +- +- True +- False +- True +- +- +- False +- True ++ False + + + +@@ -75,5 +53,63 @@ + 0 + + ++ ++ ++ True ++ False ++ icons ++ False ++ 2 ++ ++ ++ True ++ False ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ False ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ False ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ False ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ False ++ True ++ 1 ++ ++ + + diff --git a/libreoffice-select-correct-item-in-gallery.patch b/libreoffice-select-correct-item-in-gallery.patch new file mode 100644 index 0000000..8c56e08 --- /dev/null +++ b/libreoffice-select-correct-item-in-gallery.patch @@ -0,0 +1,25 @@ +From 8753cc269a350cc468e4f54f961f304a35144467 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Thu, 25 Jun 2020 21:05:26 +0100 +Subject: [PATCH] tdf#134285 select the item before dragging it + +so we don't get the previously selected item + +Change-Id: Ifd6e46d97f1de0de86403b9c237ee8d2cd3a6cd3 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97137 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +--- + +diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx +index 6604eee..47ef1757 100644 +--- a/svx/source/gallery2/galctrl.cxx ++++ b/svx/source/gallery2/galctrl.cxx +@@ -400,6 +400,7 @@ + + bool GalleryIconView::StartDrag() + { ++ Select(); + return mpParent->StartDrag(); + } + diff --git a/libreoffice-stuck-widgets-in-sidebar.patch b/libreoffice-stuck-widgets-in-sidebar.patch new file mode 100644 index 0000000..db537d3 --- /dev/null +++ b/libreoffice-stuck-widgets-in-sidebar.patch @@ -0,0 +1,69 @@ +From a76fcd9f9718b269c0c84534a75114433369bf92 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara +Date: Mon, 29 Jun 2020 20:02:26 +0100 +Subject: [PATCH] tdf#134360 some sidebar widgets getting stuck in a disabled state + +Change-Id: I655525679dd2471e9d0c1a5af246901594b188ed +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97387 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +--- + +diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +index 324a2e5..12a9eba 100644 +--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx ++++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +@@ -254,7 +254,12 @@ + break; + } + +- if( pState && eState >= SfxItemState::DEFAULT ) ++ bool bDisabled = eState == SfxItemState::DISABLED; ++ mxLeftIndent->set_sensitive(!bDisabled); ++ mxRightIndent->set_sensitive(!bDisabled); ++ mxFLineIndent->set_sensitive(!bDisabled); ++ ++ if (pState && eState >= SfxItemState::DEFAULT) + { + const SvxLRSpaceItem* pSpace = static_cast(pState); + maTxtLeft = pSpace->GetTextLeft(); +@@ -314,13 +319,7 @@ + nfVal = static_cast(mxFLineIndent->normalize( nfVal )); + mxFLineIndent->set_value( nfVal, FieldUnit::MM_100TH ); + } +- else if( eState == SfxItemState::DISABLED ) +- { +- mxLeftIndent->set_sensitive(false); +- mxRightIndent->set_sensitive(false); +- mxFLineIndent->set_sensitive(false); +- } +- else ++ else if (eState != SfxItemState::DISABLED ) + { + mxLeftIndent->set_text(""); + mxRightIndent->set_text(""); +@@ -335,6 +334,10 @@ + mxTopDist->set_max( mxTopDist->normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); + mxBottomDist->set_max( mxBottomDist->normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); + ++ bool bDisabled = eState == SfxItemState::DISABLED; ++ mxTopDist->set_sensitive(!bDisabled); ++ mxBottomDist->set_sensitive(!bDisabled); ++ + if( pState && eState >= SfxItemState::DEFAULT ) + { + const SvxULSpaceItem* pOldItem = static_cast(pState); +@@ -355,12 +358,7 @@ + nVal = mxBottomDist->normalize( nVal ); + mxBottomDist->set_value( nVal, FieldUnit::MM_100TH ); + } +- else if(eState == SfxItemState::DISABLED ) +- { +- mxTopDist->set_sensitive(false); +- mxBottomDist->set_sensitive(false); +- } +- else ++ else if (eState != SfxItemState::DISABLED ) + { + mxTopDist->set_text(""); + mxBottomDist->set_text(""); diff --git a/libreoffice.changes b/libreoffice.changes index 5939704..1e348e9 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jun 30 14:05:33 UTC 2020 - Atri Bhattacharya + +- Add patches from upstream to fix regressions: + * libreoffice-stuck-widgets-in-sidebar.patch: some sidebar + widgets getting stuck in a disabled state (boo#1173410, + tdf#134360). + * libreoffice-select-correct-item-in-gallery.patch: select the + item in gallery before dragging it (boo#1173409, tdf#134285). + * libreoffice-clipped-sidebar-paragraph-widget.patch: fix too + wide and clipped paragraph widget in sidebar (boo#1173404, + tdf#134357). + ------------------------------------------------------------------- Mon Jun 29 12:51:10 UTC 2020 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index a8bbcb3..320c564 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -104,6 +104,9 @@ Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff Patch4: poppler-0.86.patch Patch5: pyuno-nopwd.patch +Patch6: libreoffice-stuck-widgets-in-sidebar.patch +Patch7: libreoffice-select-correct-item-in-gallery.patch +Patch8: libreoffice-clipped-sidebar-paragraph-widget.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -963,6 +966,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch990 -p1 %patch991 -p1