From 041c11f6189daa057a673d62733479396f8b86d3 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Mon, 14 Dec 2020 20:17:03 +0100 Subject: [PATCH] TickerWidget: don't show percentage on balance --- src/mainwindow.cpp | 2 +- src/mainwindow.ui | 2 +- src/widgets/tickerwidget.cpp | 13 ++++++------- src/widgets/tickerwidget.h | 5 ++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3ccc3aa..07c40c7 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -162,7 +162,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) : ui->tickerLayout->addWidget(tickerWidget); } - m_balanceWidget = new TickerWidget(this, "XMR", "Balance", true); + m_balanceWidget = new TickerWidget(this, "XMR", "Balance", true, true); ui->fiatTickerLayout->addWidget(m_balanceWidget); // Send widget diff --git a/src/mainwindow.ui b/src/mainwindow.ui index b729b4e..2812b5a 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -43,7 +43,7 @@ - 7 + 0 diff --git a/src/widgets/tickerwidget.cpp b/src/widgets/tickerwidget.cpp index 76845ac..a180b42 100644 --- a/src/widgets/tickerwidget.cpp +++ b/src/widgets/tickerwidget.cpp @@ -8,11 +8,12 @@ #include "utils/config.h" #include "mainwindow.h" -TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool convertBalance) : +TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool convertBalance, bool hidePercent) : QWidget(parent), ui(new Ui::TickerWidget), m_symbol(std::move(symbol)), - m_convertBalance(convertBalance) + m_convertBalance(convertBalance), + m_hidePercent(hidePercent) { ui->setupUi(this); m_ctx = MainWindow::getContext(); @@ -27,6 +28,8 @@ TickerWidget::TickerWidget(QWidget *parent, QString symbol, QString title, bool this->setPctText(defaultPct, true); this->setFiatText(defaultFiat, 0.0); + ui->tickerPct->setHidden(hidePercent); + connect(AppContext::prices, &Prices::fiatPricesUpdated, this, &TickerWidget::init); connect(AppContext::prices, &Prices::cryptoPricesUpdated, this, &TickerWidget::init); if (convertBalance) @@ -47,7 +50,7 @@ void TickerWidget::init() { double amount = m_convertBalance ? AppContext::balance : 1.0; double conversion = AppContext::prices->convert(m_symbol, fiatCurrency, amount); if (conversion < 0) return; - setPercentHidden(conversion == 0); + ui->tickerPct->setHidden(conversion == 0 || m_hidePercent); auto markets = AppContext::prices->markets; if(!markets.contains(m_symbol)) return; @@ -85,10 +88,6 @@ void TickerWidget::removePctContainer() { ui->tickerPct->deleteLater(); } -void TickerWidget::setPercentHidden(bool hidden) { - ui->tickerPct->setVisible(!hidden); -} - TickerWidget::~TickerWidget() { delete ui; } diff --git a/src/widgets/tickerwidget.h b/src/widgets/tickerwidget.h index 92b5c32..321e2c8 100644 --- a/src/widgets/tickerwidget.h +++ b/src/widgets/tickerwidget.h @@ -17,7 +17,7 @@ class TickerWidget : public QWidget Q_OBJECT public: - explicit TickerWidget(QWidget *parent, QString symbol, QString title = "", bool convertBalance = false); + explicit TickerWidget(QWidget *parent, QString symbol, QString title = "", bool convertBalance = false, bool hidePercent = false); void removePctContainer(); void setFiatText(QString &fiatCurrency, double amount); void setPctText(QString &text, bool positive); @@ -29,11 +29,10 @@ public slots: void init(); private: - void setPercentHidden(bool hidden); - Ui::TickerWidget *ui; QString m_symbol; bool m_convertBalance; + bool m_hidePercent; AppContext *m_ctx; };