summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
authorBenjamin Saunders <ben.e.saunders@gmail.com>2017-11-05 13:04:55 -0800
committermujx <mujx@users.noreply.github.com>2017-11-05 23:04:55 +0200
commit5bd5555a51f52293853e4b4f5dc15dd1c7774538 (patch)
treee77e082ff0cd94f1543d64ff10be703c8b452e73 /src/ui
parentAdd input history, enable multi-line input, refactor commands (#119) (diff)
downloadnheko-5bd5555a51f52293853e4b4f5dc15dd1c7774538.tar.xz
Use C++11 braced list style (#121)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/OverlayModal.cc4
-rw-r--r--src/ui/ScrollBar.cc2
-rw-r--r--src/ui/Theme.cc16
-rw-r--r--src/ui/ToggleButton.cc14
4 files changed, 21 insertions, 15 deletions
diff --git a/src/ui/OverlayModal.cc b/src/ui/OverlayModal.cc

index 05bd7d03..4fb57175 100644 --- a/src/ui/OverlayModal.cc +++ b/src/ui/OverlayModal.cc
@@ -22,8 +22,8 @@ OverlayModal::OverlayModal(QWidget *parent, QWidget *content) : OverlayWidget(parent) - , duration_{ 500 } - , color_{ QColor(55, 55, 55) } + , duration_{500} + , color_{QColor(55, 55, 55)} { setAttribute(Qt::WA_TranslucentBackground); diff --git a/src/ui/ScrollBar.cc b/src/ui/ScrollBar.cc
index b186be23..24f97461 100644 --- a/src/ui/ScrollBar.cc +++ b/src/ui/ScrollBar.cc
@@ -23,7 +23,7 @@ ScrollBar::ScrollBar(QScrollArea *area, QWidget *parent) : QScrollBar(parent) - , area_{ area } + , area_{area} { hideTimer_.setSingleShot(true); diff --git a/src/ui/Theme.cc b/src/ui/Theme.cc
index 52d4b883..622428b0 100644 --- a/src/ui/Theme.cc +++ b/src/ui/Theme.cc
@@ -54,15 +54,21 @@ void Theme::setColor(const QString &key, ui::Color color) { static const QColor palette[] = { - QColor("#171919"), + QColor("#171919"), - QColor("#EBEBEB"), QColor("#C9C9C9"), QColor("#929292"), + QColor("#EBEBEB"), + QColor("#C9C9C9"), + QColor("#929292"), - QColor("#1C3133"), QColor("#577275"), QColor("#46A451"), + QColor("#1C3133"), + QColor("#577275"), + QColor("#46A451"), - QColor("#5D6565"), QColor("#E22826"), QColor("#81B3A9"), + QColor("#5D6565"), + QColor("#E22826"), + QColor("#81B3A9"), - rgba(0, 0, 0, 0), + rgba(0, 0, 0, 0), }; colors_.insert(key, palette[static_cast<int>(color)]); diff --git a/src/ui/ToggleButton.cc b/src/ui/ToggleButton.cc
index 8054bfe7..e7b242b8 100644 --- a/src/ui/ToggleButton.cc +++ b/src/ui/ToggleButton.cc
@@ -12,7 +12,7 @@ Toggle::paintEvent(QPaintEvent *event) } Toggle::Toggle(QWidget *parent) - : QAbstractButton{ parent } + : QAbstractButton{parent} { init(); @@ -89,10 +89,10 @@ Toggle::setTrackColor(const QColor &color) } ToggleThumb::ToggleThumb(Toggle *parent) - : QWidget{ parent } - , toggle_{ parent } - , position_{ Position::Right } - , offset_{ 0 } + : QWidget{parent} + , toggle_{parent} + , position_{Position::Right} + , offset_{0} { parent->installEventFilter(this); } @@ -158,8 +158,8 @@ ToggleThumb::updateOffset() } ToggleTrack::ToggleTrack(Toggle *parent) - : QWidget{ parent } - , toggle_{ parent } + : QWidget{parent} + , toggle_{parent} { Q_ASSERT(parent);