From 5d4bab4be0dfededdf16c3c35a9393738c704b5d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 11 Oct 2018 01:25:28 +0200 Subject: [PATCH] Allow to disable size grip --- src/blackgui/managedstatusbar.cpp | 9 +++++++-- src/blackgui/managedstatusbar.h | 5 ++++- src/swiftdata/swiftdata.cpp | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/blackgui/managedstatusbar.cpp b/src/blackgui/managedstatusbar.cpp index fe04c96a6..aa63ecd25 100644 --- a/src/blackgui/managedstatusbar.cpp +++ b/src/blackgui/managedstatusbar.cpp @@ -123,7 +123,7 @@ namespace BlackGui if (m_elideMode != Qt::ElideNone) { const QFontMetrics metrics(m_statusBarLabel->font()); - const QString elidedText = metrics.elidedText(statusMessage.getMessage(), m_elideMode, 0.90 * w); + const QString elidedText = metrics.elidedText(statusMessage.getMessage(), m_elideMode, qRound(0.90 * w)); m_statusBarLabel->setText(elidedText); } else @@ -135,12 +135,17 @@ namespace BlackGui void CManagedStatusBar::displayStatusMessages(const CStatusMessageList &statusMessages) { - foreach (CStatusMessage m, statusMessages) + for (const CStatusMessage &m : statusMessages) { this->displayStatusMessage(m); } } + void CManagedStatusBar::setSizeGripEnabled(bool enabled) + { + if (m_statusBar) { m_statusBar->setSizeGripEnabled(enabled); } + } + void CManagedStatusBar::clearStatusBar() { m_currentSeverity = StatusSeverity::SeverityDebug; diff --git a/src/blackgui/managedstatusbar.h b/src/blackgui/managedstatusbar.h index d8a23fcd4..3bcf4e0d9 100644 --- a/src/blackgui/managedstatusbar.h +++ b/src/blackgui/managedstatusbar.h @@ -56,6 +56,9 @@ namespace BlackGui //! Display status messages void displayStatusMessages(const BlackMisc::CStatusMessageList &statusMessages); + //! Enabled size grip + void setSizeGripEnabled(bool enabled); + private: //! Clear status bar void clearStatusBar(); @@ -64,7 +67,7 @@ namespace BlackGui QLabel *m_statusBarIcon = nullptr; //!< status bar icon QLabel *m_statusBarLabel = nullptr; //!< status bar label QTimer m_timerStatusBar { this }; //!< cleaning up status bar (own cleaning as I need to clean window / icon) - bool m_ownedStatusBar = false; //!< own status bar or "injected" + bool m_ownedStatusBar = false; //!< own status bar or "injected" (e.g.by UI builder) Qt::TextElideMode m_elideMode = Qt::ElideMiddle; //!< label text elide BlackMisc::StatusSeverity m_currentSeverity = BlackMisc::StatusSeverity::SeverityDebug; //!< severity currently displayed }; diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index ab7c4f549..cb2e20dbf 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -30,8 +30,6 @@ #include #include -class QWidget; - using namespace BlackMisc; using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; @@ -124,6 +122,7 @@ void CSwiftData::init() void CSwiftData::initLogDisplay() { m_statusBar.initStatusBar(ui->sb_SwiftData); + // m_statusBar.setSizeGripEnabled(false); CLogHandler::instance()->install(true); CLogHandler::instance()->enableConsoleOutput(false); // default disable