tdf#109425 Make paraspacing windows grab focus

to their shown SvxRelativeField when focus is gained using keyboard
navigation. The patch also corrects images used for before, after, and
above controls.

Change-Id: Ic1411ac0eddf3b281590ac5821171b5e8aaac976
Reviewed-on: https://gerrit.libreoffice.org/84103
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

4 files changed, 35 insertions, 5 deletions

diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index d945b32ed5bf..d6800db15b8c 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -116,6 +116,11 @@ ParaAboveSpacingWindow::ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::R
     m_pBelowContainer->Hide();
 }
 
+void ParaAboveSpacingWindow::GetFocus()
+{
+    m_pAboveSpacing->GrabFocus();
+}
+
 // ParaBelowSpacingWindow
 
 ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -125,6 +130,11 @@ ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::R
     m_pBelowContainer->Show();
 }
 
+void ParaBelowSpacingWindow::GetFocus()
+{
+    m_pBelowSpacing->GrabFocus();
+}
+
 // ParaLRSpacingWindow
 
 ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -304,6 +314,11 @@ ParaLeftSpacingWindow::ParaLeftSpacingWindow(vcl::Window* pParent, css::uno::Ref
     m_pFirstLineContainer->Hide();
 }
 
+void ParaLeftSpacingWindow::GetFocus()
+{
+    m_pBeforeSpacing->GrabFocus();
+}
+
 // ParaRightSpacingWindow
 
 ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -314,6 +329,11 @@ ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent, css::uno::R
     m_pFirstLineContainer->Hide();
 }
 
+void ParaRightSpacingWindow::GetFocus()
+{
+    m_pAfterSpacing->GrabFocus();
+}
+
 // ParaFirstLineSpacingWindow
 
 ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame)
@@ -324,4 +344,9 @@ ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent, css
     m_pFirstLineContainer->Show();
 }
 
+void ParaFirstLineSpacingWindow::GetFocus()
+{
+    m_pFLSpacing->GrabFocus();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index 5d0496414bd2..6d7ad8232102 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -60,12 +60,14 @@ class ParaAboveSpacingWindow : public ParaULSpacingWindow
 {
 public:
     explicit ParaAboveSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+    virtual void GetFocus() override;
 };
 
 class ParaBelowSpacingWindow : public ParaULSpacingWindow
 {
 public:
     explicit ParaBelowSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+    virtual void GetFocus() override;
 };
 
 class ParaLRSpacingWindow : public VclVBox,
@@ -100,18 +102,21 @@ class ParaLeftSpacingWindow : public ParaLRSpacingWindow
 {
 public:
     explicit ParaLeftSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+    virtual void GetFocus() override;
 };
 
 class ParaRightSpacingWindow : public ParaLRSpacingWindow
 {
 public:
     explicit ParaRightSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+    virtual void GetFocus() override;
 };
 
 class ParaFirstLineSpacingWindow : public ParaLRSpacingWindow
 {
 public:
     explicit ParaFirstLineSpacingWindow(vcl::Window* pParent, css::uno::Reference<css::frame::XFrame> const & xFrame);
+    virtual void GetFocus() override;
 };
 
 }
diff --git a/svx/uiconfig/ui/paralrspacing.ui b/svx/uiconfig/ui/paralrspacing.ui
index d38ff54dd161..6093e4a1eee9 100644
--- a/svx/uiconfig/ui/paralrspacing.ui
+++ b/svx/uiconfig/ui/paralrspacing.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -22,7 +22,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+                <property name="pixbuf">svx/res/symphony/Indent4.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -60,7 +60,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+                <property name="pixbuf">svx/res/symphony/Indent3.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/paraulspacing.ui b/svx/uiconfig/ui/paraulspacing.ui
index 6c9cd2a2e289..fc7c32ff0667 100644
--- a/svx/uiconfig/ui/paraulspacing.ui
+++ b/svx/uiconfig/ui/paraulspacing.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -29,7 +29,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/spacing2.png</property>
+                <property name="pixbuf">svx/res/symphony/spacing1.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>