Code refactoring - change code style to the new clang-format rules

This commit is contained in:
Yuriy Puchkov
2020-09-23 15:24:16 +03:00
parent 5a62cd3b13
commit b88a5fbce8
175 changed files with 6200 additions and 5356 deletions

View File

@@ -16,81 +16,92 @@
// along with Flameshot. If not, see <http://www.gnu.org/licenses/>.
#include "loadspinner.h"
#include <QApplication>
#include <QPaintEvent>
#include <QPainter>
#include <QTimer>
#include <QApplication>
#define OFFSET 5
LoadSpinner::LoadSpinner(QWidget *parent) :
QWidget(parent), m_startAngle(0), m_span(0), m_growing(true)
LoadSpinner::LoadSpinner(QWidget* parent)
: QWidget(parent)
, m_startAngle(0)
, m_span(0)
, m_growing(true)
{
setAttribute(Qt::WA_TranslucentBackground);
const int size = QApplication::fontMetrics().height() * 8;
setFixedSize(size, size);
updateFrame();
// init timer
m_timer = new QTimer(this);
m_timer = new QTimer(this);
connect(m_timer, &QTimer::timeout, this, &LoadSpinner::rotate);
m_timer->setInterval(30);
}
void LoadSpinner::setColor(const QColor &c) {
void LoadSpinner::setColor(const QColor& c)
{
m_color = c;
}
void LoadSpinner::setWidth(int w) {
void LoadSpinner::setWidth(int w)
{
setFixedSize(w, w);
updateFrame();
}
void LoadSpinner::setHeight(int h) {
void LoadSpinner::setHeight(int h)
{
setFixedSize(h, h);
updateFrame();
}
void LoadSpinner::start() {
void LoadSpinner::start()
{
m_timer->start();
}
void LoadSpinner::stop() {
void LoadSpinner::stop()
{
m_timer->stop();
}
void LoadSpinner::paintEvent(QPaintEvent *) {
void LoadSpinner::paintEvent(QPaintEvent*)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing, true);
auto pen = QPen(m_color);
pen.setWidth(height()/10);
pen.setWidth(height() / 10);
painter.setPen(pen);
painter.setOpacity(0.2);
painter.drawArc(m_frame, 0, 5760);
painter.drawArc(m_frame, 0, 5760);
painter.setOpacity(1.0);
painter.drawArc(m_frame, (m_startAngle * 16), (m_span * 16));
}
void LoadSpinner::rotate() {
void LoadSpinner::rotate()
{
const int advance = 3;
const int grow = 8;
if (m_growing) {
m_startAngle = (m_startAngle + advance) % 360;
m_span += grow;
if(m_span > 260) {
if (m_span > 260) {
m_growing = false;
}
} else {
m_startAngle = (m_startAngle + grow) % 360;
m_span = m_span + advance - grow;
if(m_span < 10) {
if (m_span < 10) {
m_growing = true;
}
}
update();
}
void LoadSpinner::updateFrame() {
m_frame = QRect(OFFSET, OFFSET, width() - OFFSET*2, height() - OFFSET*2);
void LoadSpinner::updateFrame()
{
m_frame =
QRect(OFFSET, OFFSET, width() - OFFSET * 2, height() - OFFSET * 2);
}