LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated formatting of popupview.cpp according to code-style

Browse source
This commit is contained in:
pereverzev_v 2021-02-09 10:43:24 +02:00
parent eaf625a5f0
commit 00a9f806aa
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/framework/uicomponents/view/popupview.cpp
View file

@ -4,7 +4,8 @@
#include <QUrl> #include <QUrl>
#include <QQmlContext> #include <QQmlContext>
PopupView::PopupView(QQuickItem* parent) : QQuickItem(parent) PopupView::PopupView(QQuickItem* parent)
: QQuickItem(parent)
{ {
setFlag(QQuickItem::ItemHasContents, true); setFlag(QQuickItem::ItemHasContents, true);
@ -82,8 +83,9 @@ qreal PopupView::padding() const
void PopupView::setBackgroundItem(QQuickItem* backgroundItem) void PopupView::setBackgroundItem(QQuickItem* backgroundItem)
{ {
if (m_backgroundItem == backgroundItem) if (m_backgroundItem == backgroundItem) {
return; return;
}
m_backgroundItem = backgroundItem; m_backgroundItem = backgroundItem;
emit backgroundItemChanged(m_backgroundItem); emit backgroundItemChanged(m_backgroundItem);
@ -91,8 +93,9 @@ void PopupView::setBackgroundItem(QQuickItem* backgroundItem)
void PopupView::setContentItem(QQuickItem* contentItem) void PopupView::setContentItem(QQuickItem* contentItem)
{ {
if (m_contentItem == contentItem) if (m_contentItem == contentItem) {
return; return;
}
m_contentItem = contentItem; m_contentItem = contentItem;
emit contentItemChanged(m_contentItem); emit contentItemChanged(m_contentItem);
@ -100,8 +103,9 @@ void PopupView::setContentItem(QQuickItem* contentItem)
void PopupView::setClosePolicy(PopupView::ClosePolicy closePolicy) void PopupView::setClosePolicy(PopupView::ClosePolicy closePolicy)
{ {
if (m_closePolicy == closePolicy) if (m_closePolicy == closePolicy) {
return; return;
}
m_closePolicy = closePolicy; m_closePolicy = closePolicy;
emit closePolicyChanged(m_closePolicy); emit closePolicyChanged(m_closePolicy);
@ -109,8 +113,9 @@ void PopupView::setClosePolicy(PopupView::ClosePolicy closePolicy)
void PopupView::setIsOpened(bool isOpened) void PopupView::setIsOpened(bool isOpened)
{ {
if (m_isOpened == isOpened) if (m_isOpened == isOpened) {
return; return;
}
m_isOpened = isOpened; m_isOpened = isOpened;
emit isOpenedChanged(m_isOpened); emit isOpenedChanged(m_isOpened);
@ -118,8 +123,9 @@ void PopupView::setIsOpened(bool isOpened)
void PopupView::setPadding(qreal padding) void PopupView::setPadding(qreal padding)
{ {
if (qFuzzyCompare(m_padding, padding)) if (qFuzzyCompare(m_padding, padding)) {
return; return;
}
m_padding = padding; m_padding = padding;
emit paddingChanged(m_padding); emit paddingChanged(m_padding);
@ -127,8 +133,9 @@ void PopupView::setPadding(qreal padding)
void PopupView::setPositionDisplacementX(qreal positionDisplacementX) void PopupView::setPositionDisplacementX(qreal positionDisplacementX)
{ {
if (qFuzzyCompare(m_positionDisplacementX, positionDisplacementX)) if (qFuzzyCompare(m_positionDisplacementX, positionDisplacementX)) {
return; return;
}
m_positionDisplacementX = positionDisplacementX; m_positionDisplacementX = positionDisplacementX;
setX(positionDisplacementX); setX(positionDisplacementX);
@ -137,8 +144,9 @@ void PopupView::setPositionDisplacementX(qreal positionDisplacementX)
void PopupView::setPositionDisplacementY(qreal positionDisplacementY) void PopupView::setPositionDisplacementY(qreal positionDisplacementY)
{ {
if (qFuzzyCompare(m_positionDisplacementY, positionDisplacementY)) if (qFuzzyCompare(m_positionDisplacementY, positionDisplacementY)) {
return; return;
}
m_positionDisplacementY = positionDisplacementY; m_positionDisplacementY = positionDisplacementY;
setY(positionDisplacementY); setY(positionDisplacementY);
@ -147,8 +155,9 @@ void PopupView::setPositionDisplacementY(qreal positionDisplacementY)
void PopupView::setGlobalPos(QPointF globalPos) void PopupView::setGlobalPos(QPointF globalPos)
{ {
if (m_globalPos == globalPos) if (m_globalPos == globalPos) {
return; return;
}
m_globalPos = globalPos; m_globalPos = globalPos;
m_containerView->setPosition(globalPos.toPoint()); m_containerView->setPosition(globalPos.toPoint());
@ -188,7 +197,6 @@ void PopupView::mousePressEvent(QMouseEvent* event)
} }
if (m_closePolicy == ClosePolicy::CloseOnPressOutsideParent) { if (m_closePolicy == ClosePolicy::CloseOnPressOutsideParent) {
if (!isMouseWithinBoundaries(event->globalPos())) { if (!isMouseWithinBoundaries(event->globalPos())) {
close(); close();
} }
@ -202,7 +210,6 @@ void PopupView::mouseReleaseEvent(QMouseEvent* event)
} }
if (m_closePolicy == ClosePolicy::CloseOnReleaseOutsideParent) { if (m_closePolicy == ClosePolicy::CloseOnReleaseOutsideParent) {
if (!isMouseWithinBoundaries(event->globalPos())) { if (!isMouseWithinBoundaries(event->globalPos())) {
close(); close();
} }

4
src/framework/uicomponents/view/popupview.h
View file

@ -8,8 +8,8 @@ class PopupView : public QQuickItem
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QQuickItem* backgroundItem READ backgroundItem WRITE setBackgroundItem NOTIFY backgroundItemChanged) Q_PROPERTY(QQuickItem * backgroundItem READ backgroundItem WRITE setBackgroundItem NOTIFY backgroundItemChanged)
Q_PROPERTY(QQuickItem* contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged) Q_PROPERTY(QQuickItem * contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged)
Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy NOTIFY closePolicyChanged) Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy NOTIFY closePolicyChanged)
Q_PROPERTY(QPointF globalPos READ globalPos WRITE setGlobalPos NOTIFY globalPosChanged) Q_PROPERTY(QPointF globalPos READ globalPos WRITE setGlobalPos NOTIFY globalPosChanged)

2
tools/codestyle/uncrustify_musescore.cfg
View file

@ -1590,7 +1590,7 @@ pp_define_at_level = false # false/true
# #
# true: indentation will be used only once # true: indentation will be used only once
# false: indentation will be used every time (default) # false: indentation will be used every time (default)
indent_cpp_lambda_only_once = true # true/false #indent_cpp_lambda_only_once = true # true/false
# You can force a token to be a type with the 'type' option. # You can force a token to be a type with the 'type' option.
# Example: # Example: