diff --git a/include/ui/CircularProgress.h b/include/ui/CircularProgress.h
index 6a785ca2..5ed8994d 100644
--- a/include/ui/CircularProgress.h
+++ b/include/ui/CircularProgress.h
@@ -80,35 +80,41 @@ private:
int angle_;
};
-inline void CircularProgressDelegate::setDashOffset(qreal offset)
+inline void
+CircularProgressDelegate::setDashOffset(qreal offset)
{
dash_offset_ = offset;
progress_->update();
}
-inline void CircularProgressDelegate::setDashLength(qreal length)
+inline void
+CircularProgressDelegate::setDashLength(qreal length)
{
dash_length_ = length;
progress_->update();
}
-inline void CircularProgressDelegate::setAngle(int angle)
+inline void
+CircularProgressDelegate::setAngle(int angle)
{
angle_ = angle;
progress_->update();
}
-inline qreal CircularProgressDelegate::dashOffset() const
+inline qreal
+CircularProgressDelegate::dashOffset() const
{
return dash_offset_;
}
-inline qreal CircularProgressDelegate::dashLength() const
+inline qreal
+CircularProgressDelegate::dashLength() const
{
return dash_length_;
}
-inline int CircularProgressDelegate::angle() const
+inline int
+CircularProgressDelegate::angle() const
{
return angle_;
}
diff --git a/include/ui/DropShadow.h b/include/ui/DropShadow.h
index 19d61c8d..3054d7dd 100644
--- a/include/ui/DropShadow.h
+++ b/include/ui/DropShadow.h
@@ -30,7 +30,8 @@ public:
gradient.setStart(right0);
gradient.setFinalStop(right1);
painter.setBrush(QBrush(gradient));
- painter.drawRoundRect(QRectF(QPointF(width - margin * radius, margin), QPointF(width, height - margin)), 0.0, 0.0);
+ painter.drawRoundRect(
+ QRectF(QPointF(width - margin * radius, margin), QPointF(width, height - margin)), 0.0, 0.0);
// Left
QPointF left0(margin, height / 2);
@@ -54,7 +55,8 @@ public:
gradient.setStart(bottom0);
gradient.setFinalStop(bottom1);
painter.setBrush(QBrush(gradient));
- painter.drawRoundRect(QRectF(QPointF(margin, height - margin), QPointF(width - margin, height)), 0.0, 0.0);
+ painter.drawRoundRect(
+ QRectF(QPointF(margin, height - margin), QPointF(width - margin, height)), 0.0, 0.0);
// BottomRight
QPointF bottomright0(width - margin, height - margin);
@@ -95,6 +97,7 @@ public:
// Widget
painter.setBrush(QBrush("#FFFFFF"));
painter.setRenderHint(QPainter::Antialiasing);
- painter.drawRoundRect(QRectF(QPointF(margin, margin), QPointF(width - margin, height - margin)), radius, radius);
+ painter.drawRoundRect(
+ QRectF(QPointF(margin, margin), QPointF(width - margin, height - margin)), radius, radius);
}
};
diff --git a/include/ui/FlatButton.h b/include/ui/FlatButton.h
index 5efdb838..1c44d5d7 100644
--- a/include/ui/FlatButton.h
+++ b/include/ui/FlatButton.h
@@ -63,12 +63,14 @@ private:
bool was_checked_;
};
-inline qreal FlatButtonStateMachine::overlayOpacity() const
+inline qreal
+FlatButtonStateMachine::overlayOpacity() const
{
return overlay_opacity_;
}
-inline qreal FlatButtonStateMachine::checkedOverlayProgress() const
+inline qreal
+FlatButtonStateMachine::checkedOverlayProgress() const
{
return checked_overlay_progress_;
}
@@ -86,8 +88,13 @@ class FlatButton : public QPushButton
public:
explicit FlatButton(QWidget *parent = 0, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
- explicit FlatButton(const QString &text, QWidget *parent = 0, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
- FlatButton(const QString &text, ui::Role role, QWidget *parent = 0, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
+ explicit FlatButton(const QString &text,
+ QWidget *parent = 0,
+ ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
+ FlatButton(const QString &text,
+ ui::Role role,
+ QWidget *parent = 0,
+ ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
~FlatButton();
void applyPreset(ui::ButtonPreset preset);
diff --git a/include/ui/Menu.h b/include/ui/Menu.h
index 7794b2d2..0b4eb6d5 100644
--- a/include/ui/Menu.h
+++ b/include/ui/Menu.h
@@ -8,16 +8,16 @@ class Menu : public QMenu
{
public:
Menu(QWidget *parent = nullptr)
- : QMenu(parent)
+ : QMenu(parent)
{
QFont font;
font.setPixelSize(conf::fontSize);
setFont(font);
- setStyleSheet(
- "QMenu { color: black; background-color: white; margin: 0px;}"
- "QMenu::item { color: black; padding: 7px 20px; border: 1px solid transparent; margin: 2px 0px; }"
- "QMenu::item:selected { color: black; background: rgba(180, 180, 180, 100); }");
+ setStyleSheet("QMenu { color: black; background-color: white; margin: 0px;}"
+ "QMenu::item { color: black; padding: 7px 20px; border: 1px solid transparent; margin: "
+ "2px 0px; }"
+ "QMenu::item:selected { color: black; background: rgba(180, 180, 180, 100); }");
};
protected:
diff --git a/include/ui/OverlayModal.h b/include/ui/OverlayModal.h
index d6efd29e..4dea6513 100644
--- a/include/ui/OverlayModal.h
+++ b/include/ui/OverlayModal.h
@@ -46,13 +46,15 @@ private:
QPropertyAnimation *animation_;
};
-inline void OverlayModal::setDuration(int duration)
+inline void
+OverlayModal::setDuration(int duration)
{
duration_ = duration;
animation_->setDuration(duration_);
}
-inline void OverlayModal::setColor(QColor color)
+inline void
+OverlayModal::setColor(QColor color)
{
color_ = color;
}
diff --git a/include/ui/Ripple.h b/include/ui/Ripple.h
index e04e7173..01e30698 100644
--- a/include/ui/Ripple.h
+++ b/include/ui/Ripple.h
@@ -66,67 +66,80 @@ private:
QBrush brush_;
};
-inline void Ripple::setOverlay(RippleOverlay *overlay)
+inline void
+Ripple::setOverlay(RippleOverlay *overlay)
{
overlay_ = overlay;
}
-inline qreal Ripple::radius() const
+inline qreal
+Ripple::radius() const
{
return radius_;
}
-inline qreal Ripple::opacity() const
+inline qreal
+Ripple::opacity() const
{
return opacity_;
}
-inline QColor Ripple::color() const
+inline QColor
+Ripple::color() const
{
return brush_.color();
}
-inline QBrush Ripple::brush() const
+inline QBrush
+Ripple::brush() const
{
return brush_;
}
-inline QPoint Ripple::center() const
+inline QPoint
+Ripple::center() const
{
return center_;
}
-inline QPropertyAnimation *Ripple::radiusAnimation() const
+inline QPropertyAnimation *
+Ripple::radiusAnimation() const
{
return radius_anim_;
}
-inline QPropertyAnimation *Ripple::opacityAnimation() const
+inline QPropertyAnimation *
+Ripple::opacityAnimation() const
{
return opacity_anim_;
}
-inline void Ripple::setOpacityStartValue(qreal value)
+inline void
+Ripple::setOpacityStartValue(qreal value)
{
opacity_anim_->setStartValue(value);
}
-inline void Ripple::setOpacityEndValue(qreal value)
+inline void
+Ripple::setOpacityEndValue(qreal value)
{
opacity_anim_->setEndValue(value);
}
-inline void Ripple::setRadiusStartValue(qreal value)
+inline void
+Ripple::setRadiusStartValue(qreal value)
{
radius_anim_->setStartValue(value);
}
-inline void Ripple::setRadiusEndValue(qreal value)
+inline void
+Ripple::setRadiusEndValue(qreal value)
{
radius_anim_->setEndValue(value);
}
-inline void Ripple::setDuration(int msecs)
+inline void
+Ripple::setDuration(int msecs)
{
radius_anim_->setDuration(msecs);
opacity_anim_->setDuration(msecs);
diff --git a/include/ui/RippleOverlay.h b/include/ui/RippleOverlay.h
index b3fb9a4c..cc6fd05e 100644
--- a/include/ui/RippleOverlay.h
+++ b/include/ui/RippleOverlay.h
@@ -37,18 +37,21 @@ private:
bool use_clip_;
};
-inline void RippleOverlay::setClipping(bool enable)
+inline void
+RippleOverlay::setClipping(bool enable)
{
use_clip_ = enable;
update();
}
-inline bool RippleOverlay::hasClipping() const
+inline bool
+RippleOverlay::hasClipping() const
{
return use_clip_;
}
-inline void RippleOverlay::setClipPath(const QPainterPath &path)
+inline void
+RippleOverlay::setClipPath(const QPainterPath &path)
{
clip_path_ = path;
update();
diff --git a/include/ui/TextField.h b/include/ui/TextField.h
index 11319f24..ec761483 100644
--- a/include/ui/TextField.h
+++ b/include/ui/TextField.h
@@ -92,34 +92,40 @@ private:
qreal y_;
};
-inline void TextFieldLabel::setColor(const QColor &color)
+inline void
+TextFieldLabel::setColor(const QColor &color)
{
color_ = color;
update();
}
-inline void TextFieldLabel::setOffset(const QPointF &pos)
+inline void
+TextFieldLabel::setOffset(const QPointF &pos)
{
x_ = pos.x();
y_ = pos.y();
update();
}
-inline void TextFieldLabel::setScale(qreal scale)
+inline void
+TextFieldLabel::setScale(qreal scale)
{
scale_ = scale;
update();
}
-inline QPointF TextFieldLabel::offset() const
+inline QPointF
+TextFieldLabel::offset() const
{
return QPointF(x_, y_);
}
-inline qreal TextFieldLabel::scale() const
+inline qreal
+TextFieldLabel::scale() const
{
return scale_;
}
-inline QColor TextFieldLabel::color() const
+inline QColor
+TextFieldLabel::color() const
{
return color_;
}
@@ -155,13 +161,15 @@ private:
qreal progress_;
};
-inline void TextFieldStateMachine::setProgress(qreal progress)
+inline void
+TextFieldStateMachine::setProgress(qreal progress)
{
progress_ = progress;
text_field_->update();
}
-inline qreal TextFieldStateMachine::progress() const
+inline qreal
+TextFieldStateMachine::progress() const
{
return progress_;
}
diff --git a/include/ui/Theme.h b/include/ui/Theme.h
index e63d8fc5..9806686c 100644
--- a/include/ui/Theme.h
+++ b/include/ui/Theme.h
@@ -6,11 +6,7 @@
namespace ui
{
-enum class AvatarType {
- Icon,
- Image,
- Letter
-};
+enum class AvatarType { Icon, Image, Letter };
namespace sidebar
{
@@ -23,38 +19,17 @@ const int FontSize = 16;
// Default avatar size. Width and height.
const int AvatarSize = 40;
-enum class ButtonPreset {
- FlatPreset,
- CheckablePreset
-};
+enum class ButtonPreset { FlatPreset, CheckablePreset };
-enum class RippleStyle {
- CenteredRipple,
- PositionedRipple,
- NoRipple
-};
+enum class RippleStyle { CenteredRipple, PositionedRipple, NoRipple };
-enum class OverlayStyle {
- NoOverlay,
- TintedOverlay,
- GrayOverlay
-};
+enum class OverlayStyle { NoOverlay, TintedOverlay, GrayOverlay };
-enum class Role {
- Default,
- Primary,
- Secondary
-};
+enum class Role { Default, Primary, Secondary };
-enum class ButtonIconPlacement {
- LeftIcon,
- RightIcon
-};
+enum class ButtonIconPlacement { LeftIcon, RightIcon };
-enum class ProgressType {
- DeterminateProgress,
- IndeterminateProgress
-};
+enum class ProgressType { DeterminateProgress, IndeterminateProgress };
enum class Color {
Black,
@@ -70,7 +45,7 @@ enum class Color {
Transparent
};
-} // namespace ui
+} // namespace ui
class Theme : public QObject
{
diff --git a/include/ui/ThemeManager.h b/include/ui/ThemeManager.h
index 98ed8193..a6947bc9 100644
--- a/include/ui/ThemeManager.h
+++ b/include/ui/ThemeManager.h
@@ -23,7 +23,8 @@ private:
Theme *theme_;
};
-inline ThemeManager &ThemeManager::instance()
+inline ThemeManager &
+ThemeManager::instance()
{
static ThemeManager instance;
return instance;
|
