diff options
| -rw-r--r-- | cui/uiconfig/ui/positionpage.ui | 8 | ||||
| -rw-r--r-- | include/vcl/button.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index 0e0c731d7b67..987064ff1dc8 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustment1"> @@ -82,8 +82,8 @@ <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> + <property name="active">True</property> <property name="draw_indicator">True</property> - <property name="group">subscript</property> </object> <packing> <property name="expand">False</property> @@ -99,8 +99,8 @@ <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> - <property name="active">True</property> <property name="draw_indicator">True</property> + <property name="group">normal</property> </object> <packing> <property name="expand">False</property> @@ -493,7 +493,7 @@ <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="shadow_type">in</property> diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 85f798af5c90..8a259b60b06e 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -268,6 +268,8 @@ public: class VCL_DLLPUBLIC RadioButton : public Button { private: + friend class VclBuilder; + std::shared_ptr< std::vector< VclPtr< RadioButton > > > m_xGroup; tools::Rectangle maStateRect; tools::Rectangle maMouseRect; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 219fb2dcab0b..63e459a0becb 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -418,7 +418,10 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr if (m_bLegacy) pOne->group(*pOther); else + { pOther->group(*pOne); + std::stable_sort(pOther->m_xGroup->begin(), pOther->m_xGroup->end(), sortIntoBestTabTraversalOrder(this)); + } } } |