mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
4 commits
ec7c5e083f
...
e571a0f1a6
Author | SHA1 | Date | |
---|---|---|---|
e571a0f1a6 | |||
92a0e57bf7 | |||
29de9aca0b | |||
88cfbea9cf |
|
@ -230,6 +230,8 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- security find-identity -v -p codesigning
|
- security find-identity -v -p codesigning
|
||||||
- brew update > /dev/null
|
- brew update > /dev/null
|
||||||
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c
|
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c
|
||||||
|
- brew outdated
|
||||||
|
- brew upgrade qt6 qbs
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#ifndef SCENEDEF_H
|
#ifndef SCENEDEF_H
|
||||||
#define SCENEDEF_H
|
#define SCENEDEF_H
|
||||||
|
|
||||||
#include "qtypes.h"
|
#include <QtGlobal>
|
||||||
|
|
||||||
enum class PGraphicsItem : int
|
enum class PGraphicsItem : int
|
||||||
{
|
{
|
||||||
|
|
|
@ -49,14 +49,13 @@
|
||||||
#include "../vlayout/vgraphicsfillitem.h"
|
#include "../vlayout/vgraphicsfillitem.h"
|
||||||
#include "../vlayout/vlayoutpiecepath.h"
|
#include "../vlayout/vlayoutpiecepath.h"
|
||||||
#include "../vlayout/vtextmanager.h"
|
#include "../vlayout/vtextmanager.h"
|
||||||
|
#include "../vmisc/compatibility.h"
|
||||||
#include "../vmisc/svgfont/vsvgfont.h"
|
#include "../vmisc/svgfont/vsvgfont.h"
|
||||||
#include "../vmisc/svgfont/vsvgfontdatabase.h"
|
#include "../vmisc/svgfont/vsvgfontdatabase.h"
|
||||||
#include "../vmisc/svgfont/vsvgfontengine.h"
|
#include "../vmisc/svgfont/vsvgfontengine.h"
|
||||||
#include "../vmisc/theme/vscenestylesheet.h"
|
#include "../vmisc/theme/vscenestylesheet.h"
|
||||||
#include "../vpapplication.h"
|
#include "../vpapplication.h"
|
||||||
#include "../vpatterndb/vpiecepath.h"
|
#include "../vpatterndb/vpiecepath.h"
|
||||||
#include "compatibility.h"
|
|
||||||
#include "qtpreprocessorsupport.h"
|
|
||||||
#include "undocommands/vpundomovepieceonsheet.h"
|
#include "undocommands/vpundomovepieceonsheet.h"
|
||||||
#include "undocommands/vpundopiecemove.h"
|
#include "undocommands/vpundopiecemove.h"
|
||||||
#include "vpiecegrainline.h"
|
#include "vpiecegrainline.h"
|
||||||
|
|
|
@ -63,7 +63,7 @@ void PaintVerticalFoldShadow(QPainter *painter, const QRectF &sheetRect)
|
||||||
painter->drawLine(shadowLine);
|
painter->drawLine(shadowLine);
|
||||||
painter->drawLine(QLineF(shadowLine.p2(), shadowP));
|
painter->drawLine(QLineF(shadowLine.p2(), shadowP));
|
||||||
|
|
||||||
QPolygonF const shadow{sheetRect.topLeft(), shadowLine.p2(), shadowP, sheetRect.topLeft()};
|
QPolygonF const shadow({sheetRect.topLeft(), shadowLine.p2(), shadowP, sheetRect.topLeft()});
|
||||||
|
|
||||||
painter->setBrush(QBrush(VSceneStylesheet::ManualLayoutStyle().SheetFoldShadowColor()));
|
painter->setBrush(QBrush(VSceneStylesheet::ManualLayoutStyle().SheetFoldShadowColor()));
|
||||||
painter->drawPolygon(shadow);
|
painter->drawPolygon(shadow);
|
||||||
|
@ -81,7 +81,7 @@ void PaintHorizontalFoldShadow(QPainter *painter, const QRectF &sheetRect)
|
||||||
painter->drawLine(shadowLine);
|
painter->drawLine(shadowLine);
|
||||||
painter->drawLine(QLineF(shadowLine.p2(), shadowP));
|
painter->drawLine(QLineF(shadowLine.p2(), shadowP));
|
||||||
|
|
||||||
QPolygonF const shadow{sheetRect.topRight(), shadowLine.p2(), shadowP, sheetRect.topRight()};
|
QPolygonF const shadow({sheetRect.topRight(), shadowLine.p2(), shadowP, sheetRect.topRight()});
|
||||||
|
|
||||||
painter->setBrush(QBrush(VSceneStylesheet::ManualLayoutStyle().SheetFoldShadowColor()));
|
painter->setBrush(QBrush(VSceneStylesheet::ManualLayoutStyle().SheetFoldShadowColor()));
|
||||||
painter->drawPolygon(shadow);
|
painter->drawPolygon(shadow);
|
||||||
|
|
|
@ -74,6 +74,7 @@ class VFoldLine
|
||||||
Q_DECLARE_TR_FUNCTIONS(VFoldLine) // NOLINT
|
Q_DECLARE_TR_FUNCTIONS(VFoldLine) // NOLINT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
VFoldLine() = default;
|
||||||
VFoldLine(const QLineF &line, FoldLineType type);
|
VFoldLine(const QLineF &line, FoldLineType type);
|
||||||
|
|
||||||
void SetHeight(qreal newHeight);
|
void SetHeight(qreal newHeight);
|
||||||
|
|
Loading…
Reference in a new issue