diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-07-06 19:29:00 -0400 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@googlemail.com> | 2017-07-10 23:15:28 +0200 |
| commit | 959be1b5a9cd522394dba9366686a1256588223b (patch) | |
| tree | ac6661cd4fdcefe9e9f2bb6f2cdfd749dfd86453 /sw/sdi | |
| parent | e8fcb1fbd365b7c6104c7941abee07a612ba7813 (diff) | |
UI Wrap InBackground: transition to wrapthru transparency toggle
The UI for placing a frame in the background is confusing because:
-in menus, the icon looks like a checkbox, but functions as a radio button
-it isn't obvious that "in background" is the opposite of "wrap through"
-it doesn't act like the checkboxes below it like "First paragraph"
-in dialog boxes, it is actually implemented as a checkbox toggle.
So it looks like a checkbox, and you can enable the checkbox, but
once enabled it can never be disabled. (The currently designed way is to
select wrap off/page/optimal/through in order to disable in background.)
This patch creates FN_FRAME_WRAPTHRU_TOGGLE to replace
most uses of the previous function.
Change-Id: Ia46ddbd47899e8ca569bf3adb2b1c4ad7cfa1920
Reviewed-on: https://gerrit.libreoffice.org/39673
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Diffstat (limited to 'sw/sdi')
| -rw-r--r-- | sw/sdi/_basesh.sdi | 8 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 17 |
2 files changed, 25 insertions, 0 deletions
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi index 52b3a031d3a5..5a113a5a6f53 100644 --- a/sw/sdi/_basesh.sdi +++ b/sw/sdi/_basesh.sdi @@ -486,6 +486,14 @@ interface BaseTextSelection Export = FALSE; ] + FN_FRAME_WRAPTHRU_TOGGLE // status() + [ + ExecMethod = Execute ; + StateMethod = GetState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + Export = FALSE; + ] + FN_FRAME_WRAP_CONTOUR // status() [ ExecMethod = Execute ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index efcf9a9ffe43..58e6aed7772f 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -6395,6 +6395,23 @@ SfxVoidItem WrapThroughTransparent FN_FRAME_WRAPTHRU_TRANSP GroupId = GID_FRAME; ] +SfxVoidItem WrapThroughTransparencyToggle FN_FRAME_WRAPTHRU_TOGGLE +() +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = GID_FRAME; +] + SfxVoidItem InsertText FN_INSERT_STRING (SfxStringItem Text FN_INSERT_STRING) [ |