Kaydet (Commit) fdab8ee6 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#125105 missing can-focus

Change-Id: I201b658cd0c643fbcaf2ec1411b2a2991eca36dd
Reviewed-on: https://gerrit.libreoffice.org/71758Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst fdbc1246
...@@ -127,6 +127,7 @@ public: ...@@ -127,6 +127,7 @@ public:
void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); } void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); }
void grab_focus() { m_xControl->grab_focus(); } void grab_focus() { m_xControl->grab_focus(); }
void show() { m_xControl->show(); } void show() { m_xControl->show(); }
void hide() { m_xControl->hide(); }
}; };
class SVX_DLLPUBLIC TextEncodingTreeView class SVX_DLLPUBLIC TextEncodingTreeView
...@@ -190,6 +191,7 @@ public: ...@@ -190,6 +191,7 @@ public:
void connect_row_activated(const Link<weld::TreeView&, void>& rLink) { m_xControl->connect_row_activated(rLink); } void connect_row_activated(const Link<weld::TreeView&, void>& rLink) { m_xControl->connect_row_activated(rLink); }
void grab_focus() { m_xControl->grab_focus(); } void grab_focus() { m_xControl->grab_focus(); }
void show() { m_xControl->show(); } void show() { m_xControl->show(); }
void hide() { m_xControl->hide(); }
int get_height_rows(int nRows) const int get_height_rows(int nRows) const
{ {
return m_xControl->get_height_rows(nRows); return m_xControl->get_height_rows(nRows);
......
...@@ -129,11 +129,13 @@ ScImportOptionsDlg::ScImportOptionsDlg(weld::Window* pParent, bool bAscii, ...@@ -129,11 +129,13 @@ ScImportOptionsDlg::ScImportOptionsDlg(weld::Window* pParent, bool bAscii,
{ {
m_xDialog->set_help_id(m_xDialog->get_help_id() + "?config=NonTextImport"); m_xDialog->set_help_id(m_xDialog->get_help_id() + "?config=NonTextImport");
m_xLbCharset->show(); m_xLbCharset->show();
m_xTvCharset->hide();
} }
else else
{ {
m_xTvCharset->set_size_request(-1, m_xTvCharset->get_height_rows(6)); m_xTvCharset->set_size_request(-1, m_xTvCharset->get_height_rows(6));
m_xEncGrid->set_vexpand(true); m_xEncGrid->set_vexpand(true);
m_xLbCharset->hide();
m_xTvCharset->show(); m_xTvCharset->show();
} }
......
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<property name="has_entry">True</property> <property name="has_entry">True</property>
<child internal-child="entry"> <child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry"> <object class="GtkEntry" id="comboboxtext-entry">
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="activates_default">True</property> <property name="activates_default">True</property>
</object> </object>
</child> </child>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment