Differential D26015 Diff 71593 components/containmentlayoutmanager/itemcontainer.cpp

Changeset View

Standalone View

View Options

components/containmentlayoutmanager/itemcontainer.cpp

Show First 20 Lines • Show All 523 Lines • ▼ Show 20 Line(s)513{
524 } 524​ }
525 525​
526 if (m_layout && m_layout->editMode()) { 526​ if (m_layout && m_layout->editMode()) {
527 setEditMode(true); 527​ setEditMode(true);
528 } 528​ }
529 529​
530 if (m_editMode) { 530​ if (m_editMode) {
531 grabMouse(); 531​ grabMouse();
532​ setCursor(Qt::ClosedHandCursor);
532 m_dragActive = true; 533​ m_dragActive = true;
533 emit dragActiveChanged(); 534​ emit dragActiveChanged();
534 } else if (m_editModeCondition == AfterPressAndHold) { 535​ } else if (m_editModeCondition == AfterPressAndHold) {
535 m_editModeTimer->start(QGuiApplication::styleHints()->mousePressAndHoldInterval()); 536​ m_editModeTimer->start(QGuiApplication::styleHints()->mousePressAndHoldInterval());
536 } 537​ }
537 538​
538 m_lastMousePosition = event->windowPos(); 539​ m_lastMousePosition = event->windowPos();
539 m_mouseDownPosition = event->windowPos(); 540​ m_mouseDownPosition = event->windowPos();
Show All 17 Lines545{
557 if (m_editMode && !m_layout->itemIsManaged(this)) { 558​ if (m_editMode && !m_layout->itemIsManaged(this)) {
558 m_layout->hidePlaceHolder(); 559​ m_layout->hidePlaceHolder();
559 m_layout->positionItem(this); 560​ m_layout->positionItem(this);
560 } 561​ }
561 562​
562 m_dragActive = false; 563​ m_dragActive = false;
563 if (m_editMode) { 564​ if (m_editMode) {
564 emit dragActiveChanged(); 565​ emit dragActiveChanged();
566​ setCursor(Qt::OpenHandCursor);
565 } 567​ }
566 event->accept(); 568​ event->accept();
567} 569​}
568 570​
569void ItemContainer::mouseMoveEvent(QMouseEvent *event) 571​void ItemContainer::mouseMoveEvent(QMouseEvent *event)
570{ 572​{
571 if ((event->button() == Qt::NoButton && event->buttons() == Qt::NoButton) 573​ if ((event->button() == Qt::NoButton && event->buttons() == Qt::NoButton)
572 || (!m_editMode && m_editModeCondition == Manual)) { 574​ || (!m_editMode && m_editModeCondition == Manual)) {
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Line(s)633 if (m_editModeCondition != AfterMouseOver && !m_layout->editMode()) {
632 return; 634​ return;
633 } 635​ }
634 636​
635 if (m_closeEditModeTimer) { 637​ if (m_closeEditModeTimer) {
636 m_closeEditModeTimer->stop(); 638​ m_closeEditModeTimer->stop();
637 } 639​ }
638 640​
639 if (m_layout->editMode()) { 641​ if (m_layout->editMode()) {
642​ setCursor(Qt::OpenHandCursor);
640 setEditMode(true); 643​ setEditMode(true);
641 } else { 644​ } else {
642 m_editModeTimer->start(QGuiApplication::styleHints()->mousePressAndHoldInterval()); 645​ m_editModeTimer->start(QGuiApplication::styleHints()->mousePressAndHoldInterval());
643 } 646​ }
644} 647​}
645 648​
646void ItemContainer::hoverLeaveEvent(QHoverEvent *event) 649​void ItemContainer::hoverLeaveEvent(QHoverEvent *event)
647{ 650​{
648 Q_UNUSED(event); 651​ Q_UNUSED(event);
649 652​
martUnsubmitted
Done

shouldn't be necessary here but when going out of edit mode

mart: shouldn't be necessary here but when going out of edit mode
650 if (m_editModeCondition != AfterMouseOver && !m_layout->editMode()) { 653​ if (m_editModeCondition != AfterMouseOver && !m_layout->editMode()) {
651 return; 654​ return;
652 } 655​ }
653 656​
654 m_editModeTimer->stop(); 657​ m_editModeTimer->stop();
655 if (!m_closeEditModeTimer) { 658​ if (!m_closeEditModeTimer) {
656 m_closeEditModeTimer = new QTimer(this); 659​ m_closeEditModeTimer = new QTimer(this);
657 m_closeEditModeTimer->setSingleShot(true); 660​ m_closeEditModeTimer->setSingleShot(true);
▲ Show 20 Lines • Show All 130 Lines • Show Last 20 Lines