strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enable grabbing focus to an unspecified container child

Browse source 
Change-Id: I269f76a3e71832ef2e8961952d9362838bd49cfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112577
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-03-16 12:56:42 +00:00
parent 486f329b95
commit 5aef0085ca
4 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/vcl/weld.hxx
View file

@ -346,6 +346,8 @@ public:
{
m_aContainerFocusChangedHdl = rLink;
}
// causes a child of the container to have the keyboard focus
virtual void child_grab_focus() = 0;
};
class VCL_DLLPUBLIC Box : virtual public Container

1
vcl/inc/salvtables.hxx
View file

@ -419,6 +419,7 @@ public:
bool bTakeOwnership);
virtual void HandleEventListener(VclWindowEvent& rEvent) override;
virtual void connect_container_focus_changed(const Link<Container&, void>& rLink) override;
virtual void child_grab_focus() override;
virtual void move(weld::Widget* pWidget, weld::Container* pNewParent) override;
virtual void recursively_unset_default_buttons() override;
virtual css::uno::Reference<css::awt::XWindow> CreateChildFrame() override;

9
vcl/source/app/salvtables.cxx
View file

@ -1189,6 +1189,15 @@ void SalInstanceContainer::move(weld::Widget* pWidget, weld::Container* pNewPare
pVclWidget->getWidget()->SetParentToDefaultWindow();
}
void SalInstanceContainer::child_grab_focus()
{
disable_notify_events();
m_xContainer->GrabFocus();
if (vcl::Window* pFirstChild = m_xContainer->ImplGetDlgWindow(0, GetDlgWindowType::First))
pFirstChild->ImplControlFocus();
enable_notify_events();
}
void SalInstanceContainer::recursively_unset_default_buttons()
{
implResetDefault(m_xContainer.get());

34
vcl/unx/gtk3/gtk3gtkinst.cxx
View file

@ -3817,6 +3817,27 @@ public:
GtkContainer* getContainer() { return m_pContainer; }
virtual void child_grab_focus() override
{
disable_notify_events();
gtk_widget_grab_focus(m_pWidget);
bool bHasFocusChild = gtk_container_get_focus_child(m_pContainer);
if (!bHasFocusChild)
{
GList* pChildren = gtk_container_get_children(m_pContainer);
for (GList* pChild = g_list_first(pChildren); pChild; pChild = g_list_next(pChild))
{
gtk_container_set_focus_child(m_pContainer, static_cast<GtkWidget*>(pChild->data));
bHasFocusChild = true;
break;
}
g_list_free(pChildren);
}
if (bHasFocusChild)
gtk_widget_child_focus(gtk_container_get_focus_child(GTK_CONTAINER(m_pWidget)), GTK_DIR_TAB_FORWARD);
enable_notify_events();
}
virtual void move(weld::Widget* pWidget, weld::Container* pNewParent) override
{
GtkInstanceWidget* pGtkWidget = dynamic_cast<GtkInstanceWidget*>(pWidget);
@ -8897,12 +8918,17 @@ public:
{
disable_notify_events();
gtk_widget_grab_focus(m_pWidget);
if (!gtk_container_get_focus_child(GTK_CONTAINER(m_pWidget)))
bool bHasFocusChild = gtk_container_get_focus_child(GTK_CONTAINER(m_pWidget));
if (!bHasFocusChild)
{
GtkToolItem* pItem = gtk_toolbar_get_nth_item(m_pToolbar, 0);
gtk_container_set_focus_child(GTK_CONTAINER(m_pWidget), GTK_WIDGET(pItem));
if (GtkToolItem* pItem = gtk_toolbar_get_nth_item(m_pToolbar, 0))
{
gtk_container_set_focus_child(GTK_CONTAINER(m_pWidget), GTK_WIDGET(pItem));
bHasFocusChild = true;
}
}
gtk_widget_child_focus(gtk_container_get_focus_child(GTK_CONTAINER(m_pWidget)), GTK_DIR_TAB_FORWARD);
if (bHasFocusChild)
gtk_widget_child_focus(gtk_container_get_focus_child(GTK_CONTAINER(m_pWidget)), GTK_DIR_TAB_FORWARD);
enable_notify_events();
}