rework SwScrollNaviPopup to be a simple popdown

this has never worked right for me, it appears and disappears immediately under gtk3,
automatically turns into a floating window under gen

rework it to be a simpler non-floating popdown

Change-Id: I3d13ddf81c22e0fb9616defd7d0435e9116c0ac7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86874
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 318 insertions, 23 deletions

diff --git a/sw/uiconfig/swriter/ui/floatingnavigation.ui b/sw/uiconfig/swriter/ui/floatingnavigation.ui
index 41fbb0cc78aa..82a76cfe1ff1 100644
--- a/sw/uiconfig/swriter/ui/floatingnavigation.ui
+++ b/sw/uiconfig/swriter/ui/floatingnavigation.ui
@@ -1,51 +1,346 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkWindow" id="FloatingNavigation">
+  <object class="GtkPopover" id="FloatingNavigation">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes" context="floatingnavigation|FloatingNavigation">Navigation</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">utility</property>
+    <property name="no_show_all">True</property>
+    <property name="border_width">4</property>
     <child>
-      <object class="GtkGrid" id="grid1">
+      <object class="GtkGrid" id="container">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="row_spacing">12</property>
         <child>
-          <object class="GtkLabel" id="label">
+          <object class="GtkBox" id="box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkToolbar" id="line1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="toolbar_style">icons</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToggleToolButton" id="tbl">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">tbl</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_TBL">Table</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20002.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="frm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">frm</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_FRM">Text Frame</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20003.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="grf">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">grf</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_GRF">Graphics</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20009.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="ole">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">ole</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_OLE">OLE object</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20010.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="pge">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">pge</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_PGE">Page</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20004.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="outl">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">outl</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_OUTL">Headings</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20011.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="mark">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">mark</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_MARK">Reminder</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20014.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="drw">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">drw</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_DRW">Drawing</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20005.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="ctrl">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">ctrl</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_CTRL">Control</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20006.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="prev">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">prev</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|STR_IMGBTN_PGE_UP">Previous page</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20001.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="line2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="toolbar_style">icons</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToggleToolButton" id="reg">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">reg</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_REG">Section</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20007.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="bkm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">bkm</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_BKM">Bookmark</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20008.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="sel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">sel</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_SEL">Selection</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20012.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="ftn">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">ftn</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_FTN">Footnote</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20013.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="postit">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">postit</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_POSTIT">Comment</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20015.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="rep">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">rep</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_SRCH_REP">Repeat search</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20016.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">entry</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_INDEX_ENTRY">Index entry</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20017.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="formula">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">formula</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_TABLE_FORMULA">Table formula</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20018.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="formulaerror">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">formulaerror</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|ST_TABLE_FORMULA_ERROR">Wrong table formula</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20019.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="next">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action_name">next</property>
+                    <property name="label" translatable="yes" context="floatingnavigation|STR_IMGBTN_PGE_DOWN">Next page</property>
+                    <property name="use_underline">True</property>
+                    <property name="icon_name">sw/res/sr20000.png</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box">
+          <object class="GtkLabel" id="label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
       </object>