[Libreoffice-commits] core.git: Branch 'feature/priorities' - svtools/source
Tobias Madl
tobias.madl.dev at gmail.com
Mon Nov 10 08:20:18 PST 2014
svtools/source/contnr/imivctl.hxx | 6 +++---
svtools/source/contnr/imivctl1.cxx | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 18623657715039ccbadfb4a0be9ad35a34a3784c
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date: Mon Nov 10 16:19:19 2014 +0000
Changed timer to idle
Change-Id: Id1de5f1ee73fbef9ddebd6642ab8c9b558be4d71
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 24c3bdd..03a9d06 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -164,7 +164,7 @@ class SvxIconChoiceCtrl_Impl
ScrollBarBox aScrBarBox;
Rectangle aCurSelectionRect;
std::vector<Rectangle*> aSelectedRectList;
- Timer aEditTimer; // for editing in place
+ Idle aEditIdle; // for editing in place
Timer aAutoArrangeTimer;
Timer aDocRectChangedTimer;
Timer aVisRectChangedTimer;
@@ -251,8 +251,8 @@ class SvxIconChoiceCtrl_Impl
void ToggleSelection( SvxIconChoiceCtrlEntry* );
void DeselectAllBut( SvxIconChoiceCtrlEntry*, bool bPaintSync = false );
void Center( SvxIconChoiceCtrlEntry* pEntry ) const;
- void StopEditTimer() { aEditTimer.Stop(); }
- void StartEditTimer() { aEditTimer.Start(); }
+ void StopEditTimer() { aEditIdle.Stop(); }
+ void StartEditTimer() { aEditIdle.Start(); }
void ImpHideDDIcon();
void CallSelectHandler( SvxIconChoiceCtrlEntry* );
void SelectRect(
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index bee6011..9843c5b 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -135,8 +135,8 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
nHorSBarHeight = aHorSBar.GetSizePixel().Height();
nVerSBarWidth = aVerSBar.GetSizePixel().Width();
- aEditTimer.SetTimeout( 800 );
- aEditTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,EditTimeoutHdl));
+ aEditIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
+ aEditIdle.SetIdleHdl(LINK(this,SvxIconChoiceCtrl_Impl,EditTimeoutHdl));
aAutoArrangeTimer.SetTimeout( 100 );
aAutoArrangeTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,AutoArrangeHdl));
aCallSelectHdlTimer.SetTimeout( 500 );
More information about the Libreoffice-commits
mailing list