diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-07 13:44:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-07 17:18:01 +0200 |
| commit | b8a83417ed080b4c63b797d3f6837c49cdbdd2a2 (patch) | |
| tree | 73d5b34fd4c6d837e8e6d75eebacb6dea478a3e8 /sw/source/uibase/docvw | |
| parent | 0dced3431fd7ef664d55d73ac9b1ec76d28c51fd (diff) | |
tdf#119130 only have the active postit as a dialog control...
in which pressing ctrl+tab cycles between text and button so we don't waste
time searching thousands of SwAnnotationWins
Change-Id: Iba34882c6588fc9414004f0ed3b2b779f77b30d1
Reviewed-on: https://gerrit.libreoffice.org/58682
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/docvw')
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin2.cxx | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 1cb721e4f4dc..f779c63e503c 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -62,11 +62,10 @@ namespace sw { namespace annotation { SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, - WinBits nBits, SwPostItMgr& aMgr, SwSidebarItem& rSidebarItem, SwFormatField* aField ) - : Window(&rEditWin, nBits) + : Window(&rEditWin) , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "") , mrMgr(aMgr) , mrView(rEditWin.GetView()) diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index f1c467db21f0..380831b966c8 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -1109,10 +1109,20 @@ void SwAnnotationWin::ActivatePostIt() if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) GetOutlinerView()->SetBackgroundColor(mColorDark); + + //tdf#119130 only have the active postit as a dialog control in which pressing + //ctrl+tab cycles between text and button so we don't waste time searching + //thousands of SwAnnotationWins + SetStyle(GetStyle() | WB_DIALOGCONTROL); } void SwAnnotationWin::DeactivatePostIt() { + //tdf#119130 only have the active postit as a dialog control in which pressing + //ctrl+tab cycles between text and button so we don't waste time searching + //thousands of SwAnnotationWins + SetStyle(GetStyle() & ~WB_DIALOGCONTROL); + // remove selection, #i87073# if (GetOutlinerView()->GetEditView().HasSelection()) { |