summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorPer99 <solare99@gmx.de>2024-07-29 11:36:29 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2024-07-31 09:29:47 +0200
commitef7429f86788f0616db5b274ec77eb67cd41cb3d (patch)
treef037348182ff7ba6f42cb4943701bb2676403530 /svx
parentbf47539b805a3c654fa8ab3638123875b53565d5 (diff)
tdf#161765, tdf#115688 Let user choose which animation settings to use
In the accessibility option page, the user can now choose which animation settings to use (OS's or LO's animation setting) and what animations to allow. This fixes also tdf#115688: "Add Checkbox option to disable animated overlay to Tools -> Options -> Accessibility panel" Changes due to this patch: 1. Changes in the GUI of the accessibility option page: - New option "Allow other animations" (Used for "Marching Ants" animation, instead of old expert option "AnimationsEnabled"), now as enum. - Changed option "Allow animated images", now as enum: "System", "No", "Yes" - Changed option "Allow animated text", now as enum: "System", "No", "Yes" - The old animation options in Common.xcs are not renamed, but marked as deprecated and obsolete in their text. These above changes are in the files: [optaccessibilitypage.ui, optaccessibility.hxx, optaccessibility.cxx, Common.xcs] 2. Added functions to compute if the animations of images/text/other are allowed. If "System" is chosen, then use OS’s animation setting. See files: [settings.hxx, settings.cxx] 3. Respect the animation settings of animated images/texts in Draw and Impress. Don't prohibit the user to enable animations in Draw and Impress if the OS's animations are disabled. See file: [objectcontactofpageview.cxx] 4. Respect the animation settings of animated images in Writer. See file: [viewsh.cxx] 5. Respect the "Allow other animations" setting in Calc (for "marching ants" animation). Don't prohibit the user to enable these other animations in LO if the OS's animations are disabled. See file: [overlayobject.cxx] Change-Id: I5173f9b3d8652a17a6ae07164e874143738bcd66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170827 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index ff79d5b88444..28b40a56d59e 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -375,7 +375,10 @@ namespace sdr::contact
{
if (comphelper::IsFuzzing())
return true;
- return officecfg::Office::Common::Accessibility::IsAllowAnimatedText::get();
+ // tdf#161765: Let the user choose which animation settings to use: OS's / LO's
+ // New options: "System"/"No"/"Yes".
+ // Do respect OS's animation setting if the user has selected the option "System"
+ return MiscSettings::IsAnimatedTextAllowed();
}
// check if graphic animation is allowed.
@@ -383,9 +386,11 @@ namespace sdr::contact
{
if (comphelper::IsFuzzing())
return true;
-
- // Related tdf#156630 respect system animation setting
- return officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::get() && !MiscSettings::GetUseReducedAnimation();
+ // tdf#161765: Let the user choose which animation settings to use: OS's / LO's and
+ // don't override here LO's animation settings with OS's all-or-nothing animation setting,
+ // but do respect OS's animation setting if the user has selected the option "System".
+ // New options: "System"/"No"/"Yes"
+ return MiscSettings::IsAnimatedGraphicAllowed();
}
// print?