aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring. Code style.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-01-27 16:29:00 +02:00
parent 1261708b06
commit f8562b63ea
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libs/vwidgets/fancytabbar/stylehelper.cpp
View File

@ -29,16 +29,14 @@
#include "stylehelper.h" #include "stylehelper.h"
#include <QPixmapCache>
#include <QWidget>
#include <QRect>
#include <QPainter>
#include <QApplication> #include <QApplication>
#include <QPalette>
#include <QStyleOption>
#include <QObject> #include <QObject>
#include <QPainter>
#include "../vmisc/vmath.h" #include <QPalette>
#include <QPixmapCache>
#include <QRect>
#include <QStyleOption>
#include <QWidget>
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
auto StyleHelper::sidebarFontSize() -> qreal auto StyleHelper::sidebarFontSize() -> qreal
@ -53,7 +51,7 @@ auto StyleHelper::sidebarFontSize() -> qreal
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
auto StyleHelper::panelTextColor(bool lightColored) -> QColor auto StyleHelper::panelTextColor(bool lightColored) -> QColor
{ {
//qApp->palette().highlightedText().color(); // qApp->palette().highlightedText().color();
if (!lightColored) if (!lightColored)
{ {
return Qt::white; return Qt::white;
@ -82,9 +80,7 @@ auto StyleHelper::baseColor(bool lightColored) -> QColor
auto StyleHelper::borderColor(bool lightColored) -> QColor auto StyleHelper::borderColor(bool lightColored) -> QColor
{ {
QColor result = baseColor(lightColored); QColor result = baseColor(lightColored);
result.setHsv(result.hue(), result.setHsv(result.hue(), result.saturation(), result.value() / 2);
result.saturation(),
result.value() / 2);
return result; return result;
} }
@ -103,9 +99,7 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
m_requestedBaseColor = newcolor; m_requestedBaseColor = newcolor;
QColor color; QColor color;
color.setHsv(newcolor.hue(), color.setHsv(newcolor.hue(), static_cast<int>(newcolor.saturation() * 0.7), 64 + newcolor.value() / 3);
static_cast<int>(newcolor.saturation() * 0.7),
64 + newcolor.value() / 3);
if (color.isValid() && color != m_baseColor) if (color.isValid() && color != m_baseColor)
{ {
@ -144,10 +138,10 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPain
if (iconMode == QIcon::Disabled) if (iconMode == QIcon::Disabled)
{ {
QImage im = px.toImage().convertToFormat(QImage::Format_ARGB32); QImage im = px.toImage().convertToFormat(QImage::Format_ARGB32);
for (int y=0; y<im.height(); ++y) for (int y = 0; y < im.height(); ++y)
{ {
QRgb *scanLine = reinterpret_cast<QRgb *>(im.scanLine(y)); QRgb *scanLine = reinterpret_cast<QRgb *>(im.scanLine(y));
for (int x=0; x<im.width(); ++x) for (int x = 0; x < im.width(); ++x)
{ {
QRgb pixel = *scanLine; QRgb pixel = *scanLine;
char intensity = static_cast<char>(qGray(pixel)); char intensity = static_cast<char>(qGray(pixel));