Kaydet (Commit) b8a83417 authored tarafından Caolán McNamara's avatar Caolán McNamara

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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0dced343
...@@ -59,7 +59,6 @@ class SwAnnotationWin : public vcl::Window ...@@ -59,7 +59,6 @@ class SwAnnotationWin : public vcl::Window
{ {
public: public:
SwAnnotationWin( SwEditWin& rEditWin, SwAnnotationWin( SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr, SwPostItMgr& aMgr,
SwSidebarItem& rSidebarItem, SwSidebarItem& rSidebarItem,
SwFormatField* aField ); SwFormatField* aField );
......
...@@ -150,7 +150,7 @@ VclPtr<sw::annotation::SwAnnotationWin> SwAnnotationItem::GetSidebarWindow( ...@@ -150,7 +150,7 @@ VclPtr<sw::annotation::SwAnnotationWin> SwAnnotationItem::GetSidebarWindow(
SwEditWin& rEditWin, SwEditWin& rEditWin,
SwPostItMgr& aMgr) SwPostItMgr& aMgr)
{ {
return VclPtr<sw::annotation::SwAnnotationWin>::Create( rEditWin, WB_DIALOGCONTROL, return VclPtr<sw::annotation::SwAnnotationWin>::Create( rEditWin,
aMgr, aMgr,
*this, *this,
&mrFormatField ); &mrFormatField );
......
...@@ -62,11 +62,10 @@ ...@@ -62,11 +62,10 @@
namespace sw { namespace annotation { namespace sw { namespace annotation {
SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin, SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr, SwPostItMgr& aMgr,
SwSidebarItem& rSidebarItem, SwSidebarItem& rSidebarItem,
SwFormatField* aField ) SwFormatField* aField )
: Window(&rEditWin, nBits) : Window(&rEditWin)
, maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "") , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "")
, mrMgr(aMgr) , mrMgr(aMgr)
, mrView(rEditWin.GetView()) , mrView(rEditWin.GetView())
......
...@@ -1109,10 +1109,20 @@ void SwAnnotationWin::ActivatePostIt() ...@@ -1109,10 +1109,20 @@ void SwAnnotationWin::ActivatePostIt()
if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
GetOutlinerView()->SetBackgroundColor(mColorDark); 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() 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# // remove selection, #i87073#
if (GetOutlinerView()->GetEditView().HasSelection()) if (GetOutlinerView()->GetEditView().HasSelection())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment