From 964948e3e8236ddacede749d96bb74acfd3c5457 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 10 Nov 2019 00:13:41 +0100 Subject: [PATCH] [Performance] Load indicator in views * Only use load indicator (per default) for DB object views * In any case disable load indicator for status messages --- src/blackgui/views/statusmessageview.cpp | 1 + src/blackgui/views/viewbase.h | 2 +- src/blackgui/views/viewbasenontemplate.cpp | 1 + src/blackgui/views/viewdbobjects.cpp | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/blackgui/views/statusmessageview.cpp b/src/blackgui/views/statusmessageview.cpp index 31c9d98c6..46d46d4bc 100644 --- a/src/blackgui/views/statusmessageview.cpp +++ b/src/blackgui/views/statusmessageview.cpp @@ -23,6 +23,7 @@ namespace BlackGui { m_menus |= MenuClear; m_acceptRowSelection = true; + m_enabledLoadIndicator = false; // for performance reasons this->menuRemoveItems(MenuRefresh | MenuBackend | MenuToggleSelectionMode); this->standardInit(new CStatusMessageListModel(this)); } diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 854910340..2d3fd1b5a 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -569,7 +569,7 @@ namespace BlackGui int m_loadIndicatorTimeoutMsDefault = 30 * 1000; //!< default time for timeout bool m_forceStretchLastColumnWhenResized = true; //!< a small table might (few columns) fail stretching, force again bool m_showingLoadIndicator = false; //!< showing loading indicator - bool m_enabledLoadIndicator = true; //!< loading indicator enabled/disabled + bool m_enabledLoadIndicator = false; //!< loading indicator enabled/disabled bool m_acceptClickSelection = false; //!< clicked bool m_acceptRowSelection = false; //!< selection changed bool m_acceptDoubleClickSelection = false; //!< double clicked diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp index 38d47c173..12598140b 100644 --- a/src/blackgui/views/viewbasenontemplate.cpp +++ b/src/blackgui/views/viewbasenontemplate.cpp @@ -727,6 +727,7 @@ namespace BlackGui { if (!m_enabledLoadIndicator) { return -1; } if (m_showingLoadIndicator) { return -1; } + if (this->hasDockWidgetArea()) { if (!this->isVisibleWidget()) { return -1; } diff --git a/src/blackgui/views/viewdbobjects.cpp b/src/blackgui/views/viewdbobjects.cpp index 88b470bec..a68a2b8ee 100644 --- a/src/blackgui/views/viewdbobjects.cpp +++ b/src/blackgui/views/viewdbobjects.cpp @@ -45,6 +45,7 @@ namespace BlackGui CViewBase(parent) { // void + CViewBaseNonTemplate::m_enabledLoadIndicator = true; // indicator for DB views } template