Merge pull request #5555 from Howard-C/code-formatting-2
code formatting (for single-click implementation)
This commit is contained in:
anatoly-os
GitHub
commit
feae82dd74
4 changed files with 45 additions and 14 deletions
|
|
@ -1483,8 +1483,7 @@ int Note::transposition() const
|
|||
//---------------------------------------------------------
|
||||
|
||||
class NoteEditData : public ElementEditData {
|
||||
public:
|
||||
|
||||
public:
|
||||
enum EditMode {
|
||||
EditMode_ChangePitch = 0,
|
||||
EditMode_AddSpacing,
|
||||
|
|
@ -2310,7 +2309,7 @@ int Note::customizeVelocity(int velo) const
|
|||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// editDrag
|
||||
// startDrag
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Note::startDrag(EditData& ed)
|
||||
|
|
@ -2328,6 +2327,10 @@ void Note::startDrag(EditData& ed)
|
|||
ed.addData(ned);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// drag
|
||||
//---------------------------------------------------------
|
||||
|
||||
QRectF Note::drag(EditData& ed)
|
||||
{
|
||||
NoteEditData* noteEditData = static_cast<NoteEditData*>(ed.getData(this));
|
||||
|
|
@ -2347,6 +2350,9 @@ QRectF Note::drag(EditData& ed)
|
|||
return QRectF();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// endDrag
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Note::endDrag(EditData& ed)
|
||||
{
|
||||
|
|
@ -2359,6 +2365,10 @@ void Note::endDrag(EditData& ed)
|
|||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// editDrag
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Note::editDrag(EditData& editData)
|
||||
{
|
||||
Chord* ch = chord();
|
||||
|
|
@ -2375,6 +2385,10 @@ void Note::editDrag(EditData& editData)
|
|||
triggerLayout();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// verticalDrag
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Note::verticalDrag(EditData &ed)
|
||||
{
|
||||
Fraction _tick = chord()->tick();
|
||||
|
|
@ -2425,6 +2439,10 @@ void Note::verticalDrag(EditData &ed)
|
|||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// normalizeLeftDragDelta
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Note::normalizeLeftDragDelta(Segment* seg, EditData &ed, NoteEditData* ned)
|
||||
{
|
||||
Segment* previous = seg->prev();
|
||||
|
|
@ -2454,6 +2472,10 @@ void Note::normalizeLeftDragDelta(Segment* seg, EditData &ed, NoteEditData* ned)
|
|||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// horizontalDrag
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Note::horizontalDrag(EditData &ed)
|
||||
{
|
||||
Chord* ch = chord();
|
||||
|
|
@ -3216,7 +3238,7 @@ std::vector<Note*> Note::tiedNotes() const
|
|||
notes.push_back(note);
|
||||
}
|
||||
return notes;
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// unisonIndex
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@ public:
|
|||
void setOnTimeType(int v) { _onTimeType = v; }
|
||||
int offTimeType() const { return _offTimeType; }
|
||||
int onTimeType() const { return _onTimeType; }
|
||||
};
|
||||
};
|
||||
|
||||
} // namespace Ms
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -280,9 +280,9 @@ bool ScoreView::startTextEditingOnMouseRelease(QMouseEvent* mouseEvent)
|
|||
// mouse up INSIDE textBase - set priming
|
||||
textBase->setPrimed(true);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
//mouse up INSIDE primed textBase - start editing
|
||||
// mouse up INSIDE primed textBase - start editing
|
||||
startEditMode(textBase);
|
||||
setCursor(QCursor(Qt::IBeamCursor));
|
||||
textBase->setPrimed(false);
|
||||
|
|
@ -471,8 +471,7 @@ void ScoreView::mousePressEvent(QMouseEvent* ev)
|
|||
switch (state) {
|
||||
case ViewState::NORMAL:
|
||||
case ViewState::EDIT:
|
||||
case ViewState::FOTO:
|
||||
{
|
||||
case ViewState::FOTO: {
|
||||
const qreal a = editData.grip[0].width() * 0.5;
|
||||
for (int i = 0; i < editData.grips; ++i) {
|
||||
if (editData.grip[i].adjusted(-a, -a, a, a).contains(editData.startMove)) {
|
||||
|
|
@ -494,7 +493,7 @@ void ScoreView::mousePressEvent(QMouseEvent* ev)
|
|||
}
|
||||
|
||||
switch (state) {
|
||||
case ViewState::NORMAL:
|
||||
case ViewState::NORMAL: {
|
||||
if (gripFound)
|
||||
break;
|
||||
if (ev->button() == Qt::RightButton) // context menu?
|
||||
|
|
@ -510,6 +509,7 @@ void ScoreView::mousePressEvent(QMouseEvent* ev)
|
|||
|
||||
setEditElement(elementNear(editData.startMove));
|
||||
mousePressEventNormal(ev);
|
||||
}
|
||||
break;
|
||||
|
||||
case ViewState::FOTO: {
|
||||
|
|
@ -690,7 +690,11 @@ void ScoreView::mouseMoveEvent(QMouseEvent* me)
|
|||
update();
|
||||
}
|
||||
|
||||
void ScoreView:: tripleClickTimeOut()
|
||||
//---------------------------------------------------------
|
||||
// tripleClickTimeOut
|
||||
//---------------------------------------------------------
|
||||
|
||||
void ScoreView::tripleClickTimeOut()
|
||||
{
|
||||
tripleClickPending = false;
|
||||
}
|
||||
|
|
@ -829,7 +833,7 @@ void ScoreView::keyPressEvent(QKeyEvent* ev)
|
|||
}
|
||||
#endif
|
||||
|
||||
if (!( (editData.modifiers & Qt::ShiftModifier) && (editData.key == Qt::Key_Backtab) )) {
|
||||
if (!((editData.modifiers & Qt::ShiftModifier) && (editData.key == Qt::Key_Backtab))) {
|
||||
if (editData.element->edit(editData)) {
|
||||
if (state != ViewState::EDIT) {
|
||||
// textTab or other function may have terminated edit mode
|
||||
|
|
@ -848,7 +852,7 @@ void ScoreView::keyPressEvent(QKeyEvent* ev)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// handleArrowKeys
|
||||
// handleArrowKeysPress
|
||||
//---------------------------------------------------------
|
||||
|
||||
bool ScoreView::handleArrowKeyPress(const QKeyEvent* ev)
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ Element* Palette::element(int idx)
|
|||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// contentsMousePressEvent
|
||||
// mousePressEvent
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Palette::mousePressEvent(QMouseEvent* ev)
|
||||
|
|
@ -803,6 +803,10 @@ void PaletteScrollArea::keyPressEvent(QKeyEvent* event)
|
|||
QScrollArea::keyPressEvent(event);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// mouseReleaseEvent
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Palette::mouseReleaseEvent(QMouseEvent *event)
|
||||
{
|
||||
pressedIndex = -1;
|
||||
|
|
@ -927,6 +931,7 @@ void Palette::leaveEvent(QEvent*)
|
|||
//---------------------------------------------------------
|
||||
// nextPaletteElement
|
||||
//---------------------------------------------------------
|
||||
|
||||
void Palette::nextPaletteElement()
|
||||
{
|
||||
int i = currentIdx;
|
||||
|
|
|
|||
Loading…
Reference in a new issue