diff --git a/src/ui/Avatar.cc b/src/ui/Avatar.cc
index 4245c168..878f7999 100644
--- a/src/ui/Avatar.cc
+++ b/src/ui/Avatar.cc
@@ -5,7 +5,7 @@
#include "Avatar.h"
Avatar::Avatar(QWidget *parent)
- : QWidget(parent)
+ : QWidget(parent)
{
size_ = ui::AvatarSize;
type_ = ui::AvatarType::Letter;
@@ -23,7 +23,8 @@ Avatar::~Avatar()
{
}
-QColor Avatar::textColor() const
+QColor
+Avatar::textColor() const
{
if (!text_color_.isValid())
return QColor("black");
@@ -31,7 +32,8 @@ QColor Avatar::textColor() const
return text_color_;
}
-QColor Avatar::backgroundColor() const
+QColor
+Avatar::backgroundColor() const
{
if (!text_color_.isValid())
return QColor("white");
@@ -39,33 +41,38 @@ QColor Avatar::backgroundColor() const
return background_color_;
}
-int Avatar::size() const
+int
+Avatar::size() const
{
return size_;
}
-QSize Avatar::sizeHint() const
+QSize
+Avatar::sizeHint() const
{
return QSize(size_ + 2, size_ + 2);
}
-void Avatar::setTextColor(const QColor &color)
+void
+Avatar::setTextColor(const QColor &color)
{
text_color_ = color;
}
-void Avatar::setBackgroundColor(const QColor &color)
+void
+Avatar::setBackgroundColor(const QColor &color)
{
background_color_ = color;
}
-void Avatar::setSize(int size)
+void
+Avatar::setSize(int size)
{
size_ = size;
if (!image_.isNull()) {
- pixmap_ = QPixmap::fromImage(
- image_.scaled(size_, size_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+ pixmap_ =
+ QPixmap::fromImage(image_.scaled(size_, size_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
}
QFont _font(font());
@@ -75,30 +82,33 @@ void Avatar::setSize(int size)
update();
}
-void Avatar::setLetter(const QChar &letter)
+void
+Avatar::setLetter(const QChar &letter)
{
letter_ = letter;
type_ = ui::AvatarType::Letter;
update();
}
-void Avatar::setImage(const QImage &image)
+void
+Avatar::setImage(const QImage &image)
{
image_ = image;
type_ = ui::AvatarType::Image;
- pixmap_ = QPixmap::fromImage(
- image_.scaled(size_, size_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+ pixmap_ = QPixmap::fromImage(image_.scaled(size_, size_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
update();
}
-void Avatar::setIcon(const QIcon &icon)
+void
+Avatar::setIcon(const QIcon &icon)
{
icon_ = icon;
type_ = ui::AvatarType::Icon;
update();
}
-void Avatar::paintEvent(QPaintEvent *)
+void
+Avatar::paintEvent(QPaintEvent *)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
diff --git a/src/ui/Badge.cc b/src/ui/Badge.cc
index c799dbf2..b4a04343 100644
--- a/src/ui/Badge.cc
+++ b/src/ui/Badge.cc
@@ -3,20 +3,20 @@
#include "Badge.h"
Badge::Badge(QWidget *parent)
- : OverlayWidget(parent)
+ : OverlayWidget(parent)
{
init();
}
Badge::Badge(const QIcon &icon, QWidget *parent)
- : OverlayWidget(parent)
+ : OverlayWidget(parent)
{
init();
setIcon(icon);
}
Badge::Badge(const QString &text, QWidget *parent)
- : OverlayWidget(parent)
+ : OverlayWidget(parent)
{
init();
setText(text);
@@ -26,7 +26,8 @@ Badge::~Badge()
{
}
-void Badge::init()
+void
+Badge::init()
{
x_ = 0;
y_ = 0;
@@ -44,38 +45,45 @@ void Badge::init()
setText("");
}
-QString Badge::text() const
+QString
+Badge::text() const
{
return text_;
}
-QIcon Badge::icon() const
+QIcon
+Badge::icon() const
{
return icon_;
}
-QSize Badge::sizeHint() const
+QSize
+Badge::sizeHint() const
{
const int d = diameter();
return QSize(d + 4, d + 4);
}
-qreal Badge::relativeYPosition() const
+qreal
+Badge::relativeYPosition() const
{
return y_;
}
-qreal Badge::relativeXPosition() const
+qreal
+Badge::relativeXPosition() const
{
return x_;
}
-QPointF Badge::relativePosition() const
+QPointF
+Badge::relativePosition() const
{
return QPointF(x_, y_);
}
-QColor Badge::backgroundColor() const
+QColor
+Badge::backgroundColor() const
{
if (!background_color_.isValid())
return QColor("black");
@@ -83,7 +91,8 @@ QColor Badge::backgroundColor() const
return background_color_;
}
-QColor Badge::textColor() const
+QColor
+Badge::textColor() const
{
if (!text_color_.isValid())
return QColor("white");
@@ -91,47 +100,55 @@ QColor Badge::textColor() const
return text_color_;
}
-void Badge::setTextColor(const QColor &color)
+void
+Badge::setTextColor(const QColor &color)
{
text_color_ = color;
}
-void Badge::setBackgroundColor(const QColor &color)
+void
+Badge::setBackgroundColor(const QColor &color)
{
background_color_ = color;
}
-void Badge::setRelativePosition(const QPointF &pos)
+void
+Badge::setRelativePosition(const QPointF &pos)
{
setRelativePosition(pos.x(), pos.y());
}
-void Badge::setRelativePosition(qreal x, qreal y)
+void
+Badge::setRelativePosition(qreal x, qreal y)
{
x_ = x;
y_ = y;
update();
}
-void Badge::setRelativeXPosition(qreal x)
+void
+Badge::setRelativeXPosition(qreal x)
{
x_ = x;
update();
}
-void Badge::setRelativeYPosition(qreal y)
+void
+Badge::setRelativeYPosition(qreal y)
{
y_ = y;
update();
}
-void Badge::setIcon(const QIcon &icon)
+void
+Badge::setIcon(const QIcon &icon)
{
icon_ = icon;
update();
}
-void Badge::setText(const QString &text)
+void
+Badge::setText(const QString &text)
{
text_ = text;
@@ -143,7 +160,8 @@ void Badge::setText(const QString &text)
update();
}
-void Badge::setDiameter(int diameter)
+void
+Badge::setDiameter(int diameter)
{
if (diameter > 0) {
diameter_ = diameter;
@@ -151,7 +169,8 @@ void Badge::setDiameter(int diameter)
}
}
-void Badge::paintEvent(QPaintEvent *)
+void
+Badge::paintEvent(QPaintEvent *)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
@@ -193,7 +212,8 @@ void Badge::paintEvent(QPaintEvent *)
}
}
-int Badge::diameter() const
+int
+Badge::diameter() const
{
if (icon_.isNull()) {
return qMax(size_.width(), size_.height()) + padding_;
diff --git a/src/ui/CircularProgress.cc b/src/ui/CircularProgress.cc
index 50e1dcad..425ece13 100644
--- a/src/ui/CircularProgress.cc
+++ b/src/ui/CircularProgress.cc
@@ -7,11 +7,11 @@
#include "Theme.h"
CircularProgress::CircularProgress(QWidget *parent)
- : QProgressBar{parent}
- , progress_type_{ui::ProgressType::IndeterminateProgress}
- , width_{6.25}
- , size_{64}
- , duration_{3050}
+ : QProgressBar{ parent }
+ , progress_type_{ ui::ProgressType::IndeterminateProgress }
+ , width_{ 6.25 }
+ , size_{ 64 }
+ , duration_{ 3050 }
{
delegate_ = new CircularProgressDelegate(this);
@@ -56,47 +56,55 @@ CircularProgress::CircularProgress(QWidget *parent)
group->start();
}
-void CircularProgress::setProgressType(ui::ProgressType type)
+void
+CircularProgress::setProgressType(ui::ProgressType type)
{
progress_type_ = type;
update();
}
-void CircularProgress::setLineWidth(qreal width)
+void
+CircularProgress::setLineWidth(qreal width)
{
width_ = width;
update();
updateGeometry();
}
-void CircularProgress::setSize(int size)
+void
+CircularProgress::setSize(int size)
{
size_ = size;
update();
updateGeometry();
}
-ui::ProgressType CircularProgress::progressType() const
+ui::ProgressType
+CircularProgress::progressType() const
{
return progress_type_;
}
-qreal CircularProgress::lineWidth() const
+qreal
+CircularProgress::lineWidth() const
{
return width_;
}
-int CircularProgress::size() const
+int
+CircularProgress::size() const
{
return size_;
}
-void CircularProgress::setColor(const QColor &color)
+void
+CircularProgress::setColor(const QColor &color)
{
color_ = color;
}
-QColor CircularProgress::color() const
+QColor
+CircularProgress::color() const
{
if (!color_.isValid()) {
return QColor("red");
@@ -105,13 +113,15 @@ QColor CircularProgress::color() const
return color_;
}
-QSize CircularProgress::sizeHint() const
+QSize
+CircularProgress::sizeHint() const
{
const qreal s = size_ + width_ + 8;
return QSize(s, s);
}
-void CircularProgress::paintEvent(QPaintEvent *event)
+void
+CircularProgress::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
@@ -177,11 +187,11 @@ CircularProgress::~CircularProgress()
}
CircularProgressDelegate::CircularProgressDelegate(CircularProgress *parent)
- : QObject(parent)
- , progress_(parent)
- , dash_offset_(0)
- , dash_length_(89)
- , angle_(0)
+ : QObject(parent)
+ , progress_(parent)
+ , dash_offset_(0)
+ , dash_length_(89)
+ , angle_(0)
{
Q_ASSERT(parent);
}
diff --git a/src/ui/FlatButton.cc b/src/ui/FlatButton.cc
index 7526ba9c..d59fe259 100644
--- a/src/ui/FlatButton.cc
+++ b/src/ui/FlatButton.cc
@@ -11,7 +11,8 @@
#include "RippleOverlay.h"
#include "ThemeManager.h"
-void FlatButton::init()
+void
+FlatButton::init()
{
ripple_overlay_ = new RippleOverlay(this);
state_machine_ = new FlatButtonStateMachine(this);
@@ -23,7 +24,7 @@ void FlatButton::init()
fixed_ripple_radius_ = 64;
corner_radius_ = 3;
base_opacity_ = 0.13;
- font_size_ = 10; // 10.5;
+ font_size_ = 10; // 10.5;
use_fixed_ripple_radius_ = false;
setStyle(&ThemeManager::instance());
@@ -42,21 +43,21 @@ void FlatButton::init()
}
FlatButton::FlatButton(QWidget *parent, ui::ButtonPreset preset)
- : QPushButton(parent)
+ : QPushButton(parent)
{
init();
applyPreset(preset);
}
FlatButton::FlatButton(const QString &text, QWidget *parent, ui::ButtonPreset preset)
- : QPushButton(text, parent)
+ : QPushButton(text, parent)
{
init();
applyPreset(preset);
}
FlatButton::FlatButton(const QString &text, ui::Role role, QWidget *parent, ui::ButtonPreset preset)
- : QPushButton(text, parent)
+ : QPushButton(text, parent)
{
init();
applyPreset(preset);
@@ -67,7 +68,8 @@ FlatButton::~FlatButton()
{
}
-void FlatButton::applyPreset(ui::ButtonPreset preset)
+void
+FlatButton::applyPreset(ui::ButtonPreset preset)
{
switch (preset) {
case ui::ButtonPreset::FlatPreset:
@@ -82,23 +84,27 @@ void FlatButton::applyPreset(ui::ButtonPreset preset)
}
}
-void FlatButton::setRole(ui::Role role)
+void
+FlatButton::setRole(ui::Role role)
{
role_ = role;
state_machine_->setupProperties();
}
-ui::Role FlatButton::role() const
+ui::Role
+FlatButton::role() const
{
return role_;
}
-void FlatButton::setForegroundColor(const QColor &color)
+void
+FlatButton::setForegroundColor(const QColor &color)
{
foreground_color_ = color;
}
-QColor FlatButton::foregroundColor() const
+QColor
+FlatButton::foregroundColor() const
{
if (!foreground_color_.isValid()) {
if (bg_mode_ == Qt::OpaqueMode) {
@@ -119,12 +125,14 @@ QColor FlatButton::foregroundColor() const
return foreground_color_;
}
-void FlatButton::setBackgroundColor(const QColor &color)
+void
+FlatButton::setBackgroundColor(const QColor &color)
{
background_color_ = color;
}
-QColor FlatButton::backgroundColor() const
+QColor
+FlatButton::backgroundColor() const
{
if (!background_color_.isValid()) {
switch (role_) {
@@ -141,13 +149,15 @@ QColor FlatButton::backgroundColor() const
return background_color_;
}
-void FlatButton::setOverlayColor(const QColor &color)
+void
+FlatButton::setOverlayColor(const QColor &color)
{
overlay_color_ = color;
setOverlayStyle(ui::OverlayStyle::TintedOverlay);
}
-QColor FlatButton::overlayColor() const
+QColor
+FlatButton::overlayColor() const
{
if (!overlay_color_.isValid()) {
return foregroundColor();
@@ -156,12 +166,14 @@ QColor FlatButton::overlayColor() const
return overlay_color_;
}
-void FlatButton::setDisabledForegroundColor(const QColor &color)
+void
+FlatButton::setDisabledForegroundColor(const QColor &color)
{
disabled_color_ = color;
}
-QColor FlatButton::disabledForegroundColor() const
+QColor
+FlatButton::disabledForegroundColor() const
{
if (!disabled_color_.isValid()) {
return ThemeManager::instance().themeColor("FadedWhite");
@@ -170,12 +182,14 @@ QColor FlatButton::disabledForegroundColor() const
return disabled_color_;
}
-void FlatButton::setDisabledBackgroundColor(const QColor &color)
+void
+FlatButton::setDisabledBackgroundColor(const QColor &color)
{
disabled_background_color_ = color;
}
-QColor FlatButton::disabledBackgroundColor() const
+QColor
+FlatButton::disabledBackgroundColor() const
{
if (!disabled_background_color_.isValid()) {
return ThemeManager::instance().themeColor("FadedWhite");
@@ -184,7 +198,8 @@ QColor FlatButton::disabledBackgroundColor() const
return disabled_background_color_;
}
-void FlatButton::setFontSize(qreal size)
+void
+FlatButton::setFontSize(qreal size)
{
font_size_ = size;
@@ -195,78 +210,92 @@ void FlatButton::setFontSize(qreal size)
update();
}
-qreal FlatButton::fontSize() const
+qreal
+FlatButton::fontSize() const
{
return font_size_;
}
-void FlatButton::setOverlayStyle(ui::OverlayStyle style)
+void
+FlatButton::setOverlayStyle(ui::OverlayStyle style)
{
overlay_style_ = style;
update();
}
-ui::OverlayStyle FlatButton::overlayStyle() const
+ui::OverlayStyle
+FlatButton::overlayStyle() const
{
return overlay_style_;
}
-void FlatButton::setRippleStyle(ui::RippleStyle style)
+void
+FlatButton::setRippleStyle(ui::RippleStyle style)
{
ripple_style_ = style;
}
-ui::RippleStyle FlatButton::rippleStyle() const
+ui::RippleStyle
+FlatButton::rippleStyle() const
{
return ripple_style_;
}
-void FlatButton::setIconPlacement(ui::ButtonIconPlacement placement)
+void
+FlatButton::setIconPlacement(ui::ButtonIconPlacement placement)
{
icon_placement_ = placement;
update();
}
-ui::ButtonIconPlacement FlatButton::iconPlacement() const
+ui::ButtonIconPlacement
+FlatButton::iconPlacement() const
{
return icon_placement_;
}
-void FlatButton::setCornerRadius(qreal radius)
+void
+FlatButton::setCornerRadius(qreal radius)
{
corner_radius_ = radius;
updateClipPath();
update();
}
-qreal FlatButton::cornerRadius() const
+qreal
+FlatButton::cornerRadius() const
{
return corner_radius_;
}
-void FlatButton::setBackgroundMode(Qt::BGMode mode)
+void
+FlatButton::setBackgroundMode(Qt::BGMode mode)
{
bg_mode_ = mode;
state_machine_->setupProperties();
}
-Qt::BGMode FlatButton::backgroundMode() const
+Qt::BGMode
+FlatButton::backgroundMode() const
{
return bg_mode_;
}
-void FlatButton::setBaseOpacity(qreal opacity)
+void
+FlatButton::setBaseOpacity(qreal opacity)
{
base_opacity_ = opacity;
state_machine_->setupProperties();
}
-qreal FlatButton::baseOpacity() const
+qreal
+FlatButton::baseOpacity() const
{
return base_opacity_;
}
-void FlatButton::setCheckable(bool value)
+void
+FlatButton::setCheckable(bool value)
{
state_machine_->updateCheckedStatus();
state_machine_->setCheckedOverlayProgress(0);
@@ -274,23 +303,27 @@ void FlatButton::setCheckable(bool value)
QPushButton::setCheckable(value);
}
-void FlatButton::setHasFixedRippleRadius(bool value)
+void
+FlatButton::setHasFixedRippleRadius(bool value)
{
use_fixed_ripple_radius_ = value;
}
-bool FlatButton::hasFixedRippleRadius() const
+bool
+FlatButton::hasFixedRippleRadius() const
{
return use_fixed_ripple_radius_;
}
-void FlatButton::setFixedRippleRadius(qreal radius)
+void
+FlatButton::setFixedRippleRadius(qreal radius)
{
fixed_ripple_radius_ = radius;
setHasFixedRippleRadius(true);
}
-QSize FlatButton::sizeHint() const
+QSize
+FlatButton::sizeHint() const
{
ensurePolished();
@@ -307,13 +340,15 @@ QSize FlatButton::sizeHint() const
return QSize(w, 20 + h);
}
-void FlatButton::checkStateSet()
+void
+FlatButton::checkStateSet()
{
state_machine_->updateCheckedStatus();
QPushButton::checkStateSet();
}
-void FlatButton::mousePressEvent(QMouseEvent *event)
+void
+FlatButton::mousePressEvent(QMouseEvent *event)
{
if (ui::RippleStyle::NoRipple != ripple_style_) {
QPoint pos;
@@ -345,19 +380,22 @@ void FlatButton::mousePressEvent(QMouseEvent *event)
QPushButton::mousePressEvent(event);
}
-void FlatButton::mouseReleaseEvent(QMouseEvent *event)
+void
+FlatButton::mouseReleaseEvent(QMouseEvent *event)
{
QPushButton::mouseReleaseEvent(event);
state_machine_->updateCheckedStatus();
}
-void FlatButton::resizeEvent(QResizeEvent *event)
+void
+FlatButton::resizeEvent(QResizeEvent *event)
{
QPushButton::resizeEvent(event);
updateClipPath();
}
-void FlatButton::paintEvent(QPaintEvent *event)
+void
+FlatButton::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event)
@@ -382,7 +420,8 @@ void FlatButton::paintEvent(QPaintEvent *event)
paintForeground(&painter);
}
-void FlatButton::paintBackground(QPainter *painter)
+void
+FlatButton::paintBackground(QPainter *painter)
{
const qreal overlayOpacity = state_machine_->overlayOpacity();
const qreal checkedProgress = state_machine_->checkedOverlayProgress();
@@ -436,7 +475,8 @@ void FlatButton::paintBackground(QPainter *painter)
#define COLOR_INTERPOLATE(CH) (1 - progress) * source.CH() + progress *dest.CH()
-void FlatButton::paintForeground(QPainter *painter)
+void
+FlatButton::paintForeground(QPainter *painter)
{
if (isEnabled()) {
painter->setPen(foregroundColor());
@@ -444,8 +484,7 @@ void FlatButton::paintForeground(QPainter *painter)
if (isCheckable() && progress > 0) {
QColor source = foregroundColor();
- QColor dest = Qt::TransparentMode == bg_mode_ ? Qt::white
- : backgroundColor();
+ QColor dest = Qt::TransparentMode == bg_mode_ ? Qt::white : backgroundColor();
if (qFuzzyCompare(1, progress)) {
painter->setPen(dest);
} else {
@@ -488,7 +527,8 @@ void FlatButton::paintForeground(QPainter *painter)
painter->drawPixmap(iconGeometry, pixmap);
}
-void FlatButton::updateClipPath()
+void
+FlatButton::updateClipPath()
{
const qreal radius = corner_radius_;
@@ -498,21 +538,21 @@ void FlatButton::updateClipPath()
}
FlatButtonStateMachine::FlatButtonStateMachine(FlatButton *parent)
- : QStateMachine(parent)
- , button_(parent)
- , top_level_state_(new QState(QState::ParallelStates))
- , config_state_(new QState(top_level_state_))
- , checkable_state_(new QState(top_level_state_))
- , checked_state_(new QState(checkable_state_))
- , unchecked_state_(new QState(checkable_state_))
- , neutral_state_(new QState(config_state_))
- , neutral_focused_state_(new QState(config_state_))
- , hovered_state_(new QState(config_state_))
- , hovered_focused_state_(new QState(config_state_))
- , pressed_state_(new QState(config_state_))
- , overlay_opacity_(0)
- , checked_overlay_progress_(parent->isChecked() ? 1 : 0)
- , was_checked_(false)
+ : QStateMachine(parent)
+ , button_(parent)
+ , top_level_state_(new QState(QState::ParallelStates))
+ , config_state_(new QState(top_level_state_))
+ , checkable_state_(new QState(top_level_state_))
+ , checked_state_(new QState(checkable_state_))
+ , unchecked_state_(new QState(checkable_state_))
+ , neutral_state_(new QState(config_state_))
+ , neutral_focused_state_(new QState(config_state_))
+ , hovered_state_(new QState(config_state_))
+ , hovered_focused_state_(new QState(config_state_))
+ , pressed_state_(new QState(config_state_))
+ , overlay_opacity_(0)
+ , checked_overlay_progress_(parent->isChecked() ? 1 : 0)
+ , was_checked_(false)
{
Q_ASSERT(parent);
@@ -522,8 +562,7 @@ FlatButtonStateMachine::FlatButtonStateMachine(FlatButton *parent)
addState(top_level_state_);
setInitialState(top_level_state_);
- checkable_state_->setInitialState(parent->isChecked() ? checked_state_
- : unchecked_state_);
+ checkable_state_->setInitialState(parent->isChecked() ? checked_state_ : unchecked_state_);
QSignalTransition *transition;
QPropertyAnimation *animation;
@@ -560,24 +599,28 @@ FlatButtonStateMachine::~FlatButtonStateMachine()
{
}
-void FlatButtonStateMachine::setOverlayOpacity(qreal opacity)
+void
+FlatButtonStateMachine::setOverlayOpacity(qreal opacity)
{
overlay_opacity_ = opacity;
button_->update();
}
-void FlatButtonStateMachine::setCheckedOverlayProgress(qreal opacity)
+void
+FlatButtonStateMachine::setCheckedOverlayProgress(qreal opacity)
{
checked_overlay_progress_ = opacity;
button_->update();
}
-void FlatButtonStateMachine::startAnimations()
+void
+FlatButtonStateMachine::startAnimations()
{
start();
}
-void FlatButtonStateMachine::setupProperties()
+void
+FlatButtonStateMachine::setupProperties()
{
QColor overlayColor;
@@ -600,7 +643,8 @@ void FlatButtonStateMachine::setupProperties()
button_->update();
}
-void FlatButtonStateMachine::updateCheckedStatus()
+void
+FlatButtonStateMachine::updateCheckedStatus()
{
const bool checked = button_->isChecked();
if (was_checked_ != checked) {
@@ -613,8 +657,8 @@ void FlatButtonStateMachine::updateCheckedStatus()
}
}
-bool FlatButtonStateMachine::eventFilter(QObject *watched,
- QEvent *event)
+bool
+FlatButtonStateMachine::eventFilter(QObject *watched, QEvent *event)
{
if (QEvent::FocusIn == event->type()) {
QFocusEvent *focusEvent = static_cast<QFocusEvent *>(event);
@@ -627,25 +671,20 @@ bool FlatButtonStateMachine::eventFilter(QObject *watched,
return QStateMachine::eventFilter(watched, event);
}
-void FlatButtonStateMachine::addTransition(QObject *object,
- const char *signal,
- QState *fromState,
- QState *toState)
+void
+FlatButtonStateMachine::addTransition(QObject *object, const char *signal, QState *fromState, QState *toState)
{
addTransition(new QSignalTransition(object, signal), fromState, toState);
}
-void FlatButtonStateMachine::addTransition(QObject *object,
- QEvent::Type eventType,
- QState *fromState,
- QState *toState)
+void
+FlatButtonStateMachine::addTransition(QObject *object, QEvent::Type eventType, QState *fromState, QState *toState)
{
addTransition(new QEventTransition(object, eventType), fromState, toState);
}
-void FlatButtonStateMachine::addTransition(QAbstractTransition *transition,
- QState *fromState,
- QState *toState)
+void
+FlatButtonStateMachine::addTransition(QAbstractTransition *transition, QState *fromState, QState *toState)
{
transition->setTargetState(toState);
diff --git a/src/ui/OverlayModal.cc b/src/ui/OverlayModal.cc
index 7af29268..9bce351b 100644
--- a/src/ui/OverlayModal.cc
+++ b/src/ui/OverlayModal.cc
@@ -22,9 +22,9 @@
#include "OverlayModal.h"
OverlayModal::OverlayModal(QWidget *parent, QWidget *content)
- : OverlayWidget(parent)
- , duration_{500}
- , color_{QColor(55, 55, 55)}
+ : OverlayWidget(parent)
+ , duration_{ 500 }
+ , color_{ QColor(55, 55, 55) }
{
setAttribute(Qt::WA_TranslucentBackground);
@@ -50,7 +50,8 @@ OverlayModal::OverlayModal(QWidget *parent, QWidget *content)
});
}
-void OverlayModal::paintEvent(QPaintEvent *event)
+void
+OverlayModal::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
@@ -58,14 +59,16 @@ void OverlayModal::paintEvent(QPaintEvent *event)
painter.fillRect(rect(), color_);
}
-void OverlayModal::fadeIn()
+void
+OverlayModal::fadeIn()
{
animation_->setDirection(QAbstractAnimation::Backward);
animation_->start();
show();
}
-void OverlayModal::fadeOut()
+void
+OverlayModal::fadeOut()
{
animation_->setDirection(QAbstractAnimation::Forward);
animation_->start();
diff --git a/src/ui/OverlayWidget.cc b/src/ui/OverlayWidget.cc
index d7e6337b..ab394966 100644
--- a/src/ui/OverlayWidget.cc
+++ b/src/ui/OverlayWidget.cc
@@ -2,7 +2,7 @@
#include <QEvent>
OverlayWidget::OverlayWidget(QWidget *parent)
- : QWidget(parent)
+ : QWidget(parent)
{
if (parent) {
parent->installEventFilter(this);
@@ -11,7 +11,8 @@ OverlayWidget::OverlayWidget(QWidget *parent)
}
}
-bool OverlayWidget::event(QEvent *event)
+bool
+OverlayWidget::event(QEvent *event)
{
if (!parent())
return QWidget::event(event);
@@ -33,7 +34,8 @@ bool OverlayWidget::event(QEvent *event)
return QWidget::event(event);
}
-bool OverlayWidget::eventFilter(QObject *obj, QEvent *event)
+bool
+OverlayWidget::eventFilter(QObject *obj, QEvent *event)
{
switch (event->type()) {
case QEvent::Move:
@@ -47,7 +49,8 @@ bool OverlayWidget::eventFilter(QObject *obj, QEvent *event)
return QWidget::eventFilter(obj, event);
}
-QRect OverlayWidget::overlayGeometry() const
+QRect
+OverlayWidget::overlayGeometry() const
{
QWidget *widget = parentWidget();
diff --git a/src/ui/RaisedButton.cc b/src/ui/RaisedButton.cc
index 52d74db6..f3bdb7c9 100644
--- a/src/ui/RaisedButton.cc
+++ b/src/ui/RaisedButton.cc
@@ -3,7 +3,8 @@
#include "RaisedButton.h"
-void RaisedButton::init()
+void
+RaisedButton::init()
{
shadow_state_machine_ = new QStateMachine(this);
normal_state_ = new QState;
@@ -57,13 +58,13 @@ void RaisedButton::init()
}
RaisedButton::RaisedButton(QWidget *parent)
- : FlatButton(parent)
+ : FlatButton(parent)
{
init();
}
RaisedButton::RaisedButton(const QString &text, QWidget *parent)
- : FlatButton(parent)
+ : FlatButton(parent)
{
init();
setText(text);
@@ -73,7 +74,8 @@ RaisedButton::~RaisedButton()
{
}
-bool RaisedButton::event(QEvent *event)
+bool
+RaisedButton::event(QEvent *event)
{
if (QEvent::EnabledChange == event->type()) {
if (isEnabled()) {
diff --git a/src/ui/Ripple.cc b/src/ui/Ripple.cc
index 107bfd7f..636b45d1 100644
--- a/src/ui/Ripple.cc
+++ b/src/ui/Ripple.cc
@@ -2,25 +2,25 @@
#include "RippleOverlay.h"
Ripple::Ripple(const QPoint ¢er, QObject *parent)
- : QParallelAnimationGroup(parent)
- , overlay_(0)
- , radius_anim_(animate("radius"))
- , opacity_anim_(animate("opacity"))
- , radius_(0)
- , opacity_(0)
- , center_(center)
+ : QParallelAnimationGroup(parent)
+ , overlay_(0)
+ , radius_anim_(animate("radius"))
+ , opacity_anim_(animate("opacity"))
+ , radius_(0)
+ , opacity_(0)
+ , center_(center)
{
init();
}
Ripple::Ripple(const QPoint ¢er, RippleOverlay *overlay, QObject *parent)
- : QParallelAnimationGroup(parent)
- , overlay_(overlay)
- , radius_anim_(animate("radius"))
- , opacity_anim_(animate("opacity"))
- , radius_(0)
- , opacity_(0)
- , center_(center)
+ : QParallelAnimationGroup(parent)
+ , overlay_(overlay)
+ , radius_anim_(animate("radius"))
+ , opacity_anim_(animate("opacity"))
+ , radius_(0)
+ , opacity_(0)
+ , center_(center)
{
init();
}
@@ -29,7 +29,8 @@ Ripple::~Ripple()
{
}
-void Ripple::setRadius(qreal radius)
+void
+Ripple::setRadius(qreal radius)
{
Q_ASSERT(overlay_);
@@ -40,7 +41,8 @@ void Ripple::setRadius(qreal radius)
overlay_->update();
}
-void Ripple::setOpacity(qreal opacity)
+void
+Ripple::setOpacity(qreal opacity)
{
Q_ASSERT(overlay_);
@@ -51,7 +53,8 @@ void Ripple::setOpacity(qreal opacity)
overlay_->update();
}
-void Ripple::setColor(const QColor &color)
+void
+Ripple::setColor(const QColor &color)
{
if (brush_.color() == color)
return;
@@ -62,7 +65,8 @@ void Ripple::setColor(const QColor &color)
overlay_->update();
}
-void Ripple::setBrush(const QBrush &brush)
+void
+Ripple::setBrush(const QBrush &brush)
{
brush_ = brush;
@@ -70,16 +74,16 @@ void Ripple::setBrush(const QBrush &brush)
overlay_->update();
}
-void Ripple::destroy()
+void
+Ripple::destroy()
{
Q_ASSERT(overlay_);
overlay_->removeRipple(this);
}
-QPropertyAnimation *Ripple::animate(const QByteArray &property,
- const QEasingCurve &easing,
- int duration)
+QPropertyAnimation *
+Ripple::animate(const QByteArray &property, const QEasingCurve &easing, int duration)
{
QPropertyAnimation *animation = new QPropertyAnimation;
animation->setTargetObject(this);
@@ -92,7 +96,8 @@ QPropertyAnimation *Ripple::animate(const QByteArray &property,
return animation;
}
-void Ripple::init()
+void
+Ripple::init()
{
setOpacityStartValue(0.5);
setOpacityEndValue(0);
diff --git a/src/ui/RippleOverlay.cc b/src/ui/RippleOverlay.cc
index add030d9..be070355 100644
--- a/src/ui/RippleOverlay.cc
+++ b/src/ui/RippleOverlay.cc
@@ -4,8 +4,8 @@
#include "RippleOverlay.h"
RippleOverlay::RippleOverlay(QWidget *parent)
- : OverlayWidget(parent)
- , use_clip_(false)
+ : OverlayWidget(parent)
+ , use_clip_(false)
{
setAttribute(Qt::WA_TransparentForMouseEvents);
setAttribute(Qt::WA_NoSystemBackground);
@@ -15,27 +15,31 @@ RippleOverlay::~RippleOverlay()
{
}
-void RippleOverlay::addRipple(Ripple *ripple)
+void
+RippleOverlay::addRipple(Ripple *ripple)
{
ripple->setOverlay(this);
ripples_.push_back(ripple);
ripple->start();
}
-void RippleOverlay::addRipple(const QPoint &position, qreal radius)
+void
+RippleOverlay::addRipple(const QPoint &position, qreal radius)
{
Ripple *ripple = new Ripple(position);
ripple->setRadiusEndValue(radius);
addRipple(ripple);
}
-void RippleOverlay::removeRipple(Ripple *ripple)
+void
+RippleOverlay::removeRipple(Ripple *ripple)
{
if (ripples_.removeOne(ripple))
delete ripple;
}
-void RippleOverlay::paintEvent(QPaintEvent *event)
+void
+RippleOverlay::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event)
@@ -50,7 +54,8 @@ void RippleOverlay::paintEvent(QPaintEvent *event)
paintRipple(&painter, *it);
}
-void RippleOverlay::paintRipple(QPainter *painter, Ripple *ripple)
+void
+RippleOverlay::paintRipple(QPainter *painter, Ripple *ripple)
{
const qreal radius = ripple->radius();
const QPointF center = ripple->center();
diff --git a/src/ui/ScrollBar.cc b/src/ui/ScrollBar.cc
index 300b9a04..73cdf2ba 100644
--- a/src/ui/ScrollBar.cc
+++ b/src/ui/ScrollBar.cc
@@ -22,8 +22,8 @@
#include "ScrollBar.h"
ScrollBar::ScrollBar(QScrollArea *area, QWidget *parent)
- : QScrollBar(parent)
- , area_{area}
+ : QScrollBar(parent)
+ , area_{ area }
{
hideTimer_.setSingleShot(true);
@@ -33,7 +33,8 @@ ScrollBar::ScrollBar(QScrollArea *area, QWidget *parent)
setGraphicsEffect(eff);
}
-void ScrollBar::fadeOut()
+void
+ScrollBar::fadeOut()
{
isActive = false;
@@ -45,7 +46,8 @@ void ScrollBar::fadeOut()
anim->start(QPropertyAnimation::DeleteWhenStopped);
}
-void ScrollBar::fadeIn()
+void
+ScrollBar::fadeIn()
{
QPropertyAnimation *anim = new QPropertyAnimation(eff, "opacity");
anim->setDuration(AnimationDuration);
@@ -55,7 +57,8 @@ void ScrollBar::fadeIn()
anim->start(QPropertyAnimation::DeleteWhenStopped);
}
-void ScrollBar::sliderChange(SliderChange change)
+void
+ScrollBar::sliderChange(SliderChange change)
{
if (!isActive)
fadeIn();
@@ -67,7 +70,8 @@ void ScrollBar::sliderChange(SliderChange change)
QScrollBar::sliderChange(change);
}
-void ScrollBar::paintEvent(QPaintEvent *)
+void
+ScrollBar::paintEvent(QPaintEvent *)
{
if (!width() && !height()) {
hide();
diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc
index ca2c3c11..2d529326 100644
--- a/src/ui/TextField.cc
+++ b/src/ui/TextField.cc
@@ -8,7 +8,7 @@
#include <QPropertyAnimation>
TextField::TextField(QWidget *parent)
- : QLineEdit(parent)
+ : QLineEdit(parent)
{
// Get rid of the focus border on macOS.
setAttribute(Qt::WA_MacShowFocusRect, 0);
@@ -36,17 +36,20 @@ TextField::~TextField()
{
}
-void TextField::setBackgroundColor(const QColor &color)
+void
+TextField::setBackgroundColor(const QColor &color)
{
background_color_ = color;
}
-QColor TextField::backgroundColor() const
+QColor
+TextField::backgroundColor() const
{
return background_color_;
}
-void TextField::setShowLabel(bool value)
+void
+TextField::setShowLabel(bool value)
{
if (show_label_ == value) {
return;
@@ -66,12 +69,14 @@ void TextField::setShowLabel(bool value)
}
}
-bool TextField::hasLabel() const
+bool
+TextField::hasLabel() const
{
return show_label_;
}
-void TextField::setLabelFontSize(qreal size)
+void
+TextField::setLabelFontSize(qreal size)
{
label_font_size_ = size;
@@ -83,30 +88,35 @@ void TextField::setLabelFontSize(qreal size)
}
}
-qreal TextField::labelFontSize() const
+qreal
+TextField::labelFontSize() const
{
return label_font_size_;
}
-void TextField::setLabel(const QString &label)
+void
+TextField::setLabel(const QString &label)
{
label_text_ = label;
setShowLabel(true);
label_->update();
}
-QString TextField::label() const
+QString
+TextField::label() const
{
return label_text_;
}
-void TextField::setTextColor(const QColor &color)
+void
+TextField::setTextColor(const QColor &color)
{
text_color_ = color;
setStyleSheet(QString("QLineEdit { color: %1; }").arg(color.name()));
}
-QColor TextField::textColor() const
+QColor
+TextField::textColor() const
{
if (!text_color_.isValid()) {
return QColor("black");
@@ -115,26 +125,30 @@ QColor TextField::textColor() const
return text_color_;
}
-void TextField::setLabelColor(const QColor &color)
+void
+TextField::setLabelColor(const QColor &color)
{
label_color_ = color;
}
-QColor TextField::labelColor() const
+QColor
+TextField::labelColor() const
{
if (!label_color_.isValid()) {
- return QColor("#abb"); // TODO: Move this into Theme.h
+ return QColor("#abb"); // TODO: Move this into Theme.h
}
return label_color_;
}
-void TextField::setInkColor(const QColor &color)
+void
+TextField::setInkColor(const QColor &color)
{
ink_color_ = color;
}
-QColor TextField::inkColor() const
+QColor
+TextField::inkColor() const
{
if (!ink_color_.isValid()) {
return QColor("black");
@@ -143,12 +157,14 @@ QColor TextField::inkColor() const
return ink_color_;
}
-void TextField::setUnderlineColor(const QColor &color)
+void
+TextField::setUnderlineColor(const QColor &color)
{
underline_color_ = color;
}
-QColor TextField::underlineColor() const
+QColor
+TextField::underlineColor() const
{
if (!underline_color_.isValid()) {
return QColor("black");
@@ -157,7 +173,8 @@ QColor TextField::underlineColor() const
return underline_color_;
}
-bool TextField::event(QEvent *event)
+bool
+TextField::event(QEvent *event)
{
switch (event->type()) {
case QEvent::Resize:
@@ -173,7 +190,8 @@ bool TextField::event(QEvent *event)
return QLineEdit::event(event);
}
-void TextField::paintEvent(QPaintEvent *event)
+void
+TextField::paintEvent(QPaintEvent *event)
{
QLineEdit::paintEvent(event);
@@ -181,7 +199,7 @@ void TextField::paintEvent(QPaintEvent *event)
if (text().isEmpty()) {
painter.setOpacity(1 - state_machine_->progress());
- //painter.fillRect(rect(), parentWidget()->palette().color(backgroundRole()));
+ // painter.fillRect(rect(), parentWidget()->palette().color(backgroundRole()));
painter.fillRect(rect(), backgroundColor());
}
@@ -210,7 +228,8 @@ void TextField::paintEvent(QPaintEvent *event)
}
TextFieldStateMachine::TextFieldStateMachine(TextField *parent)
- : QStateMachine(parent), text_field_(parent)
+ : QStateMachine(parent)
+ , text_field_(parent)
{
normal_state_ = new QState;
focused_state_ = new QState;
@@ -258,7 +277,8 @@ TextFieldStateMachine::~TextFieldStateMachine()
{
}
-void TextFieldStateMachine::setLabel(TextFieldLabel *label)
+void
+TextFieldStateMachine::setLabel(TextFieldLabel *label)
{
if (label_) {
delete label_;
@@ -290,7 +310,8 @@ void TextFieldStateMachine::setLabel(TextFieldLabel *label)
setupProperties();
}
-void TextFieldStateMachine::setupProperties()
+void
+TextFieldStateMachine::setupProperties()
{
if (label_) {
const int m = text_field_->textMargins().top();
@@ -316,7 +337,8 @@ void TextFieldStateMachine::setupProperties()
}
TextFieldLabel::TextFieldLabel(TextField *parent)
- : QWidget(parent), text_field_(parent)
+ : QWidget(parent)
+ , text_field_(parent)
{
x_ = 0;
y_ = 26;
@@ -333,7 +355,8 @@ TextFieldLabel::~TextFieldLabel()
{
}
-void TextFieldLabel::paintEvent(QPaintEvent *)
+void
+TextFieldLabel::paintEvent(QPaintEvent *)
{
if (!text_field_->hasLabel())
return;
diff --git a/src/ui/Theme.cc b/src/ui/Theme.cc
index ff32c92d..328bd874 100644
--- a/src/ui/Theme.cc
+++ b/src/ui/Theme.cc
@@ -3,7 +3,7 @@
#include "Theme.h"
Theme::Theme(QObject *parent)
- : QObject(parent)
+ : QObject(parent)
{
setColor("Black", ui::Color::Black);
@@ -26,7 +26,8 @@ Theme::~Theme()
{
}
-QColor Theme::rgba(int r, int g, int b, qreal a) const
+QColor
+Theme::rgba(int r, int g, int b, qreal a) const
{
QColor color(r, g, b);
color.setAlphaF(a);
@@ -34,7 +35,8 @@ QColor Theme::rgba(int r, int g, int b, qreal a) const
return color;
}
-QColor Theme::getColor(const QString &key) const
+QColor
+Theme::getColor(const QString &key) const
{
if (!colors_.contains(key)) {
qWarning() << "Color with key" << key << "could not be found";
@@ -44,27 +46,23 @@ QColor Theme::getColor(const QString &key) const
return colors_.value(key);
}
-void Theme::setColor(const QString &key, const QColor &color)
+void
+Theme::setColor(const QString &key, const QColor &color)
{
colors_.insert(key, color);
}
-void Theme::setColor(const QString &key, ui::Color color)
+void
+Theme::setColor(const QString &key, ui::Color color)
{
static const QColor palette[] = {
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),
};
diff --git a/src/ui/ThemeManager.cc b/src/ui/ThemeManager.cc
index 3c8a16ab..021008b1 100644
--- a/src/ui/ThemeManager.cc
+++ b/src/ui/ThemeManager.cc
@@ -7,13 +7,15 @@ ThemeManager::ThemeManager()
setTheme(new Theme);
}
-void ThemeManager::setTheme(Theme *theme)
+void
+ThemeManager::setTheme(Theme *theme)
{
theme_ = theme;
theme_->setParent(this);
}
-QColor ThemeManager::themeColor(const QString &key) const
+QColor
+ThemeManager::themeColor(const QString &key) const
{
Q_ASSERT(theme_);
return theme_->getColor(key);
|
