diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-01-16 01:44:51 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2018-01-17 01:43:26 +0100 |
| commit | 1ec49f8a3917cec0ef82665d61f63e4b190fc298 (patch) | |
| tree | 32f9277b83869aa0b8d416d18bd4550393b26765 /reportdesign | |
| parent | 9b197ca70a591cba050075b61b7da1ecd9e4e224 (diff) | |
Handle focus_on_click glade property for buttons
It maps to our WB_NOPOINTERFOCUS.
Change-Id: Ib00e696801b72de2c931e282ed8d50c972fa59fb
Reviewed-on: https://gerrit.libreoffice.org/47990
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 5 | ||||
| -rw-r--r-- | reportdesign/uiconfig/dbreport/ui/conditionwin.ui | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index d1b890156b94..9a8df2a42e1f 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -146,11 +146,6 @@ Condition::Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, m_pAddCondition->SetClickHdl( LINK( this, Condition, OnConditionAction ) ); m_pRemoveCondition->SetClickHdl( LINK( this, Condition, OnConditionAction ) ); - m_pMoveUp->SetStyle( m_pMoveUp->GetStyle() | WB_NOPOINTERFOCUS ); - m_pMoveDown->SetStyle( m_pMoveDown->GetStyle() | WB_NOPOINTERFOCUS ); - m_pAddCondition->SetStyle( m_pAddCondition->GetStyle() | WB_NOPOINTERFOCUS ); - m_pRemoveCondition->SetStyle( m_pRemoveCondition->GetStyle() | WB_NOPOINTERFOCUS ); - vcl::Font aFont( m_pAddCondition->GetFont() ); aFont.SetWeight( WEIGHT_BOLD ); m_pAddCondition->SetFont( aFont ); diff --git a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui index b5bb144de770..0b8d21f4ea43 100644 --- a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui +++ b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui @@ -186,6 +186,7 @@ <object class="GtkButton" id="upButton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="image">image1</property> </object> @@ -342,6 +343,7 @@ <object class="GtkButton" id="downButton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="valign">start</property> <property name="image">image2</property> @@ -371,6 +373,7 @@ <property name="label" translatable="yes" context="conditionwin|removeButton">-</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> </object> <packing> @@ -385,6 +388,7 @@ <property name="label" translatable="yes" context="conditionwin|addButton">+</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="halign">end</property> </object> |