include/vcl/toolkit/roadmap.hxx | 2 +-
vcl/inc/wizdlg.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/roadmap.cxx | 5 +++--
vcl/source/control/roadmapwizard.cxx | 4 ++--
5 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit a4c9b7f3722cb496c01ae72c5897f3243523658d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 15 16:39:08 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 16 16:03:19 2021 +0100
tdf#138829 don't grab focus to roadmap label when sync timer fires
Change-Id: Icc8a03a2ce5d63f3a2c477671a9aa52aefd1df96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109385
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index c2654c1fd56e..7cfd6d7bd290 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -73,7 +73,7 @@ public:
void DeleteRoadmapItem( ItemIndex _nIndex );
ItemId GetCurrentRoadmapItemID() const;
- bool SelectRoadmapItemByID( ItemId _nItemID );
+ bool SelectRoadmapItemByID(ItemId nItemID, bool bGrabFocus =
true);
void SetItemSelectHdl( const Link<LinkParamNone*,void>& _rHdl );
Link<LinkParamNone*,void> const & GetItemSelectHdl( ) const;
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 32a6401a6799..7c6af8636260 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -145,7 +145,7 @@ namespace vcl
void InsertRoadmapItem(int nIndex, const OUString& rLabel,
int nId, bool bEnabled);
void DeleteRoadmapItems();
int GetCurrentRoadmapItemID() const;
- void SelectRoadmapItemByID(int nId);
+ void SelectRoadmapItemByID(int nId, bool bGrabFocus = true);
void SetItemSelectHdl( const Link<LinkParamNone*,void>&
_rHdl );
void ShowRoadmap(bool bShow);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index cb806a5174bd..d10a2450d5c0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1913,7 +1913,7 @@ IMPL_LINK_NOARG(SalInstanceAssistant, UpdateRoadmap_Hdl,
Timer*, void)
m_xWizard->InsertRoadmapItem(nPos++, rLabel, m_aIds[i], bSensitive);
}
- m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()]);
+ m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()], false);
m_xWizard->ShowRoadmap(nPos != 0);
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index f1df11cff5bb..bc6a9c125de8 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -523,7 +523,7 @@ void ORoadmap::GetFocus()
pCurHyperLabel->GrabFocus();
}
-bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
+bool ORoadmap::SelectRoadmapItemByID(ItemId _nNewID, bool bGrabFocus)
{
DeselectOldRoadmapItems();
RoadmapItem* pItem = GetByID( _nNewID );
@@ -534,7 +534,8 @@ bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
const StyleSettings& rStyleSettings =
GetSettings().GetStyleSettings();
pItem->ToggleBackgroundColor( rStyleSettings.GetHighlightColor()
); //HighlightColor
- pItem->GrabFocus();
+ if (bGrabFocus)
+ pItem->GrabFocus();
m_pImpl->setCurItemID(_nNewID);
Select();
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index d73cc1a18a5b..1b24e39cc4fc 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -827,9 +827,9 @@ namespace vcl
m_xRoadmapImpl->pRoadmap->InsertRoadmapItem(nItemIndex, rText,
nItemId, bEnable);
}
- void RoadmapWizard::SelectRoadmapItemByID(int nItemId)
+ void RoadmapWizard::SelectRoadmapItemByID(int nItemId, bool bGrabFocus)
{
- m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId);
+ m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId, bGrabFocus);
}
void RoadmapWizard::DeleteRoadmapItems()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
