diff options
Diffstat (limited to 'vcl/source/window')
-rw-r--r-- | vcl/source/window/bubblewindow.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/cursor.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/dialog.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 29 | ||||
-rw-r--r-- | vcl/source/window/floatwin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/seleng.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/splitwin.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/syswin.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 5 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/window2.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/wrkwin.cxx | 10 |
14 files changed, 41 insertions, 46 deletions
diff --git a/vcl/source/window/bubblewindow.cxx b/vcl/source/window/bubblewindow.cxx index f4e491242c52..a0c20cedd99e 100644 --- a/vcl/source/window/bubblewindow.cxx +++ b/vcl/source/window/bubblewindow.cxx @@ -215,7 +215,9 @@ void BubbleWindow::RecalcTextRects() } MenuBarUpdateIconManager::MenuBarUpdateIconManager() - : mnIconID (0) + : maTimeoutTimer("MenuBarUpdateIconManager") + , maWaitIdle("vcl MenuBarUpdateIconManager maWaitIdle") + , mnIconID (0) , mbShowMenuIcon(false) , mbShowBubble(false) , mbBubbleChanged( false ) diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index bab975a0b602..09406b927e00 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -32,7 +32,7 @@ struct ImplCursorData { - AutoTimer maTimer; // Timer + AutoTimer maTimer { "vcl ImplCursorData maTimer" }; // Timer Point maPixPos; // Pixel-Position Point maPixRotOff; // Pixel-Offset-Position Size maPixSize; // Pixel-Size @@ -212,7 +212,6 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore ) mpData.reset( new ImplCursorData ); mpData->mbCurVisible = false; mpData->maTimer.SetInvokeHandler( LINK( this, Cursor, ImplTimerHdl ) ); - mpData->maTimer.SetDebugName( "vcl ImplCursorData maTimer" ); } mpData->mpWindow = pWindow; diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a3ae03980540..8292e62b2b6e 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -541,7 +541,7 @@ void Dialog::ImplLOKNotifier(vcl::Window* pParent) } Dialog::Dialog( WindowType nType ) - : SystemWindow( nType ) + : SystemWindow( nType, "vcl::Dialog maLayoutIdle" ) , mnInitFlag(InitFlag::Default) { ImplInitDialogData(); @@ -571,7 +571,7 @@ void Dialog::doDeferredInit(WinBits nBits) } Dialog::Dialog(vcl::Window* pParent, std::u16string_view rID, const OUString& rUIXMLDescription) - : SystemWindow(WindowType::DIALOG) + : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle") , mnInitFlag(InitFlag::Default) { ImplLOKNotifier(pParent); @@ -580,7 +580,7 @@ Dialog::Dialog(vcl::Window* pParent, std::u16string_view rID, const OUString& rU } Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) - : SystemWindow(WindowType::DIALOG) + : SystemWindow(WindowType::DIALOG, "vcl::Dialog maLayoutIdle") , mnInitFlag(eFlag) { ImplLOKNotifier(pParent); diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 645aa8dc19e5..e71c7f420580 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -74,6 +74,8 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), mnLastTicks( tools::Time::GetSystemTicks() ), + m_aDockTimer("vcl::ImplDockFloatWin2 m_aDockTimer"), + m_aEndDockTimer( "vcl::ImplDockFloatWin2 m_aEndDockTimer" ), mbInMove( false ), mnLastUserEvent( nullptr ) { @@ -93,12 +95,10 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, m_aDockTimer.SetInvokeHandler( LINK( this, ImplDockFloatWin2, DockTimerHdl ) ); m_aDockTimer.SetPriority( TaskPriority::HIGH_IDLE ); m_aDockTimer.SetTimeout( 50 ); - m_aDockTimer.SetDebugName( "vcl::ImplDockFloatWin2 m_aDockTimer" ); m_aEndDockTimer.SetInvokeHandler( LINK( this, ImplDockFloatWin2, EndDockTimerHdl ) ); m_aEndDockTimer.SetPriority( TaskPriority::HIGH_IDLE ); m_aEndDockTimer.SetTimeout( 50 ); - m_aEndDockTimer.SetDebugName( "vcl::ImplDockFloatWin2 m_aEndDockTimer" ); } ImplDockFloatWin2::~ImplDockFloatWin2() diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 892a1cf95727..99c4f1bba398 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -86,6 +86,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), mnLastTicks( tools::Time::GetSystemTicks() ), + maDockIdle( "vcl::ImplDockFloatWin maDockIdle" ), mbInMove( false ), mnLastUserEvent( nullptr ) { @@ -104,7 +105,6 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, maDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin, DockTimerHdl ) ); maDockIdle.SetPriority( TaskPriority::HIGH_IDLE ); - maDockIdle.SetDebugName( "vcl::ImplDockFloatWin maDockIdle" ); } ImplDockFloatWin::~ImplDockFloatWin() @@ -307,7 +307,6 @@ void DockingWindow::ImplInitDockingWindowData() //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); maLayoutIdle.SetInvokeHandler( LINK( this, DockingWindow, ImplHandleLayoutTimerHdl ) ); - maLayoutIdle.SetDebugName( "vcl::DockingWindow maLayoutIdle" ); } void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) @@ -344,14 +343,16 @@ void DockingWindow::ImplInitSettings() SetBackground( aColor ); } -DockingWindow::DockingWindow( WindowType nType ) : - Window(nType) +DockingWindow::DockingWindow( WindowType nType, const char* pIdleDebugName ) : + Window(nType), + maLayoutIdle( pIdleDebugName ) { ImplInitDockingWindowData(); } -DockingWindow::DockingWindow( vcl::Window* pParent, WinBits nStyle ) : - Window( WindowType::DOCKINGWINDOW ) +DockingWindow::DockingWindow( vcl::Window* pParent, WinBits nStyle, const char* pIdleDebugName ) : + Window( WindowType::DOCKINGWINDOW ), + maLayoutIdle( pIdleDebugName ) { ImplInitDockingWindowData(); ImplInit( pParent, nStyle ); @@ -375,8 +376,10 @@ void DockingWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUStr } DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, - const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) - : Window(WindowType::DOCKINGWINDOW) + const OUString& rUIXMLDescription, const char* pIdleDebugName, + const css::uno::Reference<css::frame::XFrame> &rFrame) + : Window(WindowType::DOCKINGWINDOW), + maLayoutIdle( pIdleDebugName ) { ImplInitDockingWindowData(); @@ -1074,11 +1077,6 @@ void DockingWindow::SetFloatingPos( const Point& rNewPos ) maFloatPos = rNewPos; } -void DockingWindow::SetIdleDebugName( const char *pDebugName ) -{ - maLayoutIdle.SetDebugName( pDebugName ); -} - SystemWindow* DockingWindow::GetFloatingWindow() const { return mpFloatWin; @@ -1088,6 +1086,7 @@ DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::un : DockingWindow(pParent, !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), + "vcl::DropdownDockingWindow maLayoutIdle", rFrame) , m_xBox(m_pUIBuilder->get("box")) { @@ -1105,13 +1104,13 @@ void DropdownDockingWindow::dispose() } ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame) - : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui", rFrame) + : DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui", "vcl::ResizableDockingWindow maLayoutIdle", rFrame) , m_xBox(m_pUIBuilder->get("box")) { } ResizableDockingWindow::ResizableDockingWindow(vcl::Window* pParent, WinBits nStyle) - : DockingWindow(pParent, nStyle) + : DockingWindow(pParent, nStyle, "vcl::ResizableDockingWindow maLayoutIdle") { } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index d218e243f862..f8beb309b3d8 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -149,13 +149,13 @@ void FloatingWindow::ImplInitSettings() } FloatingWindow::FloatingWindow(vcl::Window* pParent, WinBits nStyle) : - SystemWindow(WindowType::FLOATINGWINDOW) + SystemWindow(WindowType::FLOATINGWINDOW, "vcl::FloatingWindow maLayoutIdle") { ImplInitFloating(pParent, nStyle); } FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) - : SystemWindow(WindowType::FLOATINGWINDOW) + : SystemWindow(WindowType::FLOATINGWINDOW, "vcl::FloatingWindow maLayoutIdle") , mpNextFloat(nullptr) , mpFirstPopupModeWin(nullptr) , mnPostId(nullptr) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index f78036a6459c..85478ac64764 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -31,6 +31,9 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBits nStyle ) : FloatingWindow( pParent, nStyle ), pMenu(pMen), + aHighlightChangedTimer("vcl::MenuFloatingWindow aHighlightChangedTimer"), + aSubmenuCloseTimer( "vcl::MenuFloatingWindow aSubmenuCloseTimer" ), + aScrollTimer( "vcl::MenuFloatingWindow aScrollTimer" ), nHighlightedItem(ITEMPOS_INVALID), nMBDownPos(ITEMPOS_INVALID), nScrollerHeight(0), @@ -51,14 +54,11 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBit aHighlightChangedTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, HighlightChanged ) ); aHighlightChangedTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() ); - aHighlightChangedTimer.SetDebugName( "vcl::MenuFloatingWindow aHighlightChangedTimer" ); aSubmenuCloseTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() ); aSubmenuCloseTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, SubmenuClose ) ); - aSubmenuCloseTimer.SetDebugName( "vcl::MenuFloatingWindow aSubmenuCloseTimer" ); aScrollTimer.SetInvokeHandler( LINK( this, MenuFloatingWindow, AutoScroll ) ); - aScrollTimer.SetDebugName( "vcl::MenuFloatingWindow aScrollTimer" ); AddEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) ); } diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 88e1c1a5f6dd..f81ffe6cd6d3 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -36,6 +36,7 @@ inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const SelectionEngine::SelectionEngine( vcl::Window* pWindow, FunctionSet* pFuncSet ) : pWin( pWindow ), + aWTimer( "vcl::SelectionEngine aWTimer" ), nUpdateInterval( SELENG_AUTOREPEAT_INTERVAL ) { eSelMode = SelectionMode::Single; @@ -45,7 +46,6 @@ SelectionEngine::SelectionEngine( vcl::Window* pWindow, FunctionSet* pFuncSet ) aWTimer.SetInvokeHandler( LINK( this, SelectionEngine, ImpWatchDog ) ); aWTimer.SetTimeout( nUpdateInterval ); - aWTimer.SetDebugName( "vcl::SelectionEngine aWTimer" ); } SelectionEngine::~SelectionEngine() diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index fa3cada9ecfa..1cb8389fac99 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -1137,10 +1137,9 @@ void SplitWindow::ImplInitSettings() } SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) : - DockingWindow( WindowType::SPLITWINDOW ) + DockingWindow( WindowType::SPLITWINDOW, "vcl::SplitWindow maLayoutIdle" ) { ImplInit( pParent, nStyle ); - DockingWindow::SetIdleDebugName( "vcl::SplitWindow maLayoutIdle" ); } SplitWindow::~SplitWindow() diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index d6991ab11636..c624c373aa77 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -64,7 +64,7 @@ SystemWindow::ImplData::ImplData() maMaxOutSize = Size( SHRT_MAX, SHRT_MAX ); } -SystemWindow::SystemWindow(WindowType nType) +SystemWindow::SystemWindow(WindowType nType, const char* pIdleDebugName) : Window(nType) , mbDockBtn(false) , mbHideBtn(false) @@ -74,6 +74,7 @@ SystemWindow::SystemWindow(WindowType nType) , mnMenuBarMode(MenuBarMode::Normal) , mnIcon(0) , mpImplData(new ImplData) + , maLayoutIdle( pIdleDebugName ) , mbIsDeferredInit(false) { mpWindowImpl->mbSysWin = true; @@ -82,7 +83,6 @@ SystemWindow::SystemWindow(WindowType nType) //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); maLayoutIdle.SetInvokeHandler( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) ); - maLayoutIdle.SetDebugName( "vcl::SystemWindow maLayoutIdle" ); } void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 6cfe69aff8a8..82d301840e9a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1167,7 +1167,6 @@ void ToolBox::ImplInitToolBoxData() // set timeout and handler for dropdown items mpData->maDropdownTimer.SetTimeout( 250 ); mpData->maDropdownTimer.SetInvokeHandler( LINK( this, ToolBox, ImplDropdownLongClickHdl ) ); - mpData->maDropdownTimer.SetDebugName( "vcl::ToolBox mpData->maDropdownTimer" ); } void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) @@ -1274,7 +1273,7 @@ void ToolBox::queue_resize(StateChangedType eReason) } ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : - DockingWindow( WindowType::TOOLBOX ) + DockingWindow( WindowType::TOOLBOX, "vcl::ToolBox maLayoutIdle" ) { ImplInitToolBoxData(); ImplInit( pParent, nStyle ); @@ -1282,7 +1281,7 @@ ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : ToolBox::ToolBox(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) - : DockingWindow(WindowType::TOOLBOX) + : DockingWindow(WindowType::TOOLBOX, "vcl::ToolBox maLayoutIdle") { ImplInitToolBoxData(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index c02dc534337b..f5cf9b855103 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -760,6 +760,8 @@ ImplWinData::~ImplWinData() } ImplFrameData::ImplFrameData( vcl::Window *pWindow ) + : maPaintIdle( "vcl::Window maPaintIdle" ), + maResizeIdle( "vcl::Window maResizeIdle" ) { ImplSVData* pSVData = ImplGetSVData(); assert (pSVData->maFrameData.mpFirstFrame.get() != pWindow); @@ -799,10 +801,8 @@ ImplFrameData::ImplFrameData( vcl::Window *pWindow ) mbSysObjFocus = false; maPaintIdle.SetPriority( TaskPriority::REPAINT ); maPaintIdle.SetInvokeHandler( LINK( pWindow, vcl::Window, ImplHandlePaintHdl ) ); - maPaintIdle.SetDebugName( "vcl::Window maPaintIdle" ); maResizeIdle.SetPriority( TaskPriority::RESIZE ); maResizeIdle.SetInvokeHandler( LINK( pWindow, vcl::Window, ImplHandleResizeTimerHdl ) ); - maResizeIdle.SetDebugName( "vcl::Window maResizeIdle" ); mbInternalDragGestureRecognizer = false; mbInBufferedPaint = false; mnDPIX = 96; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index dd3a5fe05b28..cd596b240012 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -253,14 +253,13 @@ void Window::StartTracking( StartTrackingFlags nFlags ) if ( nFlags & (StartTrackingFlags::ScrollRepeat | StartTrackingFlags::ButtonRepeat) ) { - pSVData->mpWinData->mpTrackTimer = new AutoTimer; + pSVData->mpWinData->mpTrackTimer = new AutoTimer("vcl::Window pSVData->mpWinData->mpTrackTimer"); if ( nFlags & StartTrackingFlags::ScrollRepeat ) pSVData->mpWinData->mpTrackTimer->SetTimeout( MouseSettings::GetScrollRepeat() ); else pSVData->mpWinData->mpTrackTimer->SetTimeout( MouseSettings::GetButtonStartRepeat() ); pSVData->mpWinData->mpTrackTimer->SetInvokeHandler( LINK( this, Window, ImplTrackTimerHdl ) ); - pSVData->mpWinData->mpTrackTimer->SetDebugName( "vcl::Window pSVData->mpWinData->mpTrackTimer" ); pSVData->mpWinData->mpTrackTimer->Start(); } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index d7066f7a9b90..6dfdd4c0d367 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -40,8 +40,6 @@ void WorkWindow::ImplInitWorkWindowData() mbPresentationVisible = false; mbPresentationFull = false; mbFullScreenMode = false; - - maLayoutIdle.SetDebugName( "vcl::WorkWindow maLayoutIdle" ); } void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) @@ -85,20 +83,20 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno: } WorkWindow::WorkWindow( WindowType nType ) : - SystemWindow( nType ) + SystemWindow( nType, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); } WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) : - SystemWindow( WindowType::WORKWINDOW ) + SystemWindow( WindowType::WORKWINDOW, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); ImplInit( pParent, nStyle ); } WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : - SystemWindow( WindowType::WORKWINDOW ) + SystemWindow( WindowType::WORKWINDOW, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); mbSysChild = true; @@ -106,7 +104,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWi } WorkWindow::WorkWindow( SystemParentData* pParent ) : - SystemWindow( WindowType::WORKWINDOW ) + SystemWindow( WindowType::WORKWINDOW, "vcl::WorkWindow maLayoutIdle" ) { ImplInitWorkWindowData(); mbSysChild = true; |