summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-08 20:43:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-02-10 15:20:26 +0100
commitabfdfe6ac1bfc917d1693874f9dec80167e0806f (patch)
treeadd0fa41f3d148ca9efaf844ae19552a2a504fb3 /sfx2
parent56f79ad5d70226ca64423044c0ba92e265776802 (diff)
weld SvxFmTbxCtlRecTotal label item window
and SvxFmTbxCtlRecText label item window and SvxFmTbxCtlRecFromText label item window Change-Id: I5c5bbdacfe7e69abd44b9a548deadbf6c4d2a7d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88283 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/InterimItemWindow.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/sfx2/source/control/InterimItemWindow.cxx b/sfx2/source/control/InterimItemWindow.cxx
index d2beb658181a..8e6ddb096318 100644
--- a/sfx2/source/control/InterimItemWindow.cxx
+++ b/sfx2/source/control/InterimItemWindow.cxx
@@ -17,6 +17,8 @@ InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXM
m_xVclContentArea->Show();
m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, rUIXMLDescription));
m_xContainer = m_xBuilder->weld_container(rID);
+
+ SetBackground(Wallpaper(COL_TRANSPARENT));
}
InterimItemWindow::~InterimItemWindow() { disposeOnce(); }
@@ -64,16 +66,18 @@ bool InterimItemWindow::ChildKeyInput(const KeyEvent& rKEvt)
SetFakeFocus(true);
GrabFocus();
- /* let toolbox know we have focus so it updates its mnHighItemId to point
+ /* now give focus to our toolbox parent */
+ vcl::Window* pToolBox = GetParent();
+ pToolBox->GrabFocus();
+
+ /* let toolbox know this item window has focus so it updates its mnHighItemId to point
to this toolitem in case tab means to move to another toolitem within
the toolbox
*/
NotifyEvent aNEvt(MouseNotifyEvent::GETFOCUS, this);
- vcl::Window* pToolBox = GetParent();
pToolBox->EventNotify(aNEvt);
- /* now give focus to our toolbox parent and send it the tab */
- pToolBox->GrabFocus();
+ /* send parent the tab */
pToolBox->KeyInput(rKEvt);
return true;