Graphisc flags added

src/domain/UBItem.h

@@ -95,6 +95,28 @@ class UBItem
 
 };
 
+// Might be fit in int value under most OS
+enum UBGraphicsFlag {
+    GF_NONE                          = 0x0000 //0000 0000 0000 0000
+    ,GF_FLIPPABLE_X_AXIS             = 0x0001 //0000 0000 0000 0001
+    ,GF_FLIPPABLE_Y_AXIS             = 0x0002 //0000 0000 0000 0010
+    ,GF_FLIPPABLE_ALL_AXIS           = 0x0003 //0000 0000 0000 0011 GF_FLIPPABLE_X_AXIS | GF_FLIPPABLE_Y_AXIS
+    ,GF_REVOLVABLE                   = 0x0004 //0000 0000 0000 0100
+    ,GF_SCALABLE_X_AXIS              = 0x0008 //0000 0000 0000 1000
+    ,GF_SCALABLE_Y_AXIS              = 0x0010 //0000 0000 0001 0000
+    ,GF_SCALABLE_ALL_AXIS            = 0x0018 //0000 0000 0001 1000 GF_SCALABLE_X_AXIS | GF_SCALABLE_Y_AXIS
+    ,GF_DUPLICATION_ENABLED          = 0x0020 //0000 0000 0010 0000
+    ,GF_MENU_SPECIFIED               = 0x0040 //0000 0000 0100 0000
+    ,GF_ZORDER_MANIPULATIONS_ALLOWED = 0x0080 //0000 0000 1000 0000
+    ,GF_TOOLBAR_USED                 = 0x0100 //0000 0001 0000 0000
+    ,GF_SHOW_CONTENT_SOURCE          = 0x0200 //0000 0010 0000 0000
+    ,GF_COMMON                       = 0x00F8 /*0000 0000 1111 1000   GF_FLIPPABLE_ALL_AXIS
+                                                                     |GF_DUPLICATION_ENABLED
+                                                                     |GF_MENU_SPECIFIED
+                                                                     |GF_ZORDER_MANIPULATIONS_ALLOWED */
+    ,GF_ALL                          = 0xFFFF //1111 1111 1111 1111
+};
+Q_DECLARE_FLAGS(UBGraphicsFlags, UBGraphicsFlag)
 
 class UBGraphicsItem
 {

src/domain/UBSelectionFrame.cpp

@@ -42,8 +42,9 @@ UBSelectionFrame::UBSelectionFrame()
     //        connect(mZOrderDownButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelBottom()));
     mButtons << mZOrderDownButton;
 
-
     connect(UBApplication::boardController, SIGNAL(zoomChanged(qreal)), this, SLOT(onZoomChanged(qreal)));
+
+    onZoomChanged(UBApplication::boardController->currentZoom());
 }
 
 void UBSelectionFrame::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -53,11 +54,11 @@ void UBSelectionFrame::paint(QPainter *painter, const QStyleOptionGraphicsItem *
 
     QPainterPath path;
     QRectF shRect = option->rect;
-    path.addRoundedRect(shRect, mThickness / 2, mThickness / 2);
+    path.addRoundedRect(shRect, adjThickness() / 2, adjThickness() / 2);
 
     if (rect().width() > 1 && rect().height() > 1) {
         QPainterPath extruded;
-        extruded.addRect(shRect.adjusted(mThickness, mThickness, (mThickness * -1), (mThickness * -1)));
+        extruded.addRect(shRect.adjusted(adjThickness(), adjThickness(), (adjThickness() * -1), (adjThickness() * -1)));
         path = path.subtracted(extruded);
     }
 
@@ -66,15 +67,15 @@ void UBSelectionFrame::paint(QPainter *painter, const QStyleOptionGraphicsItem *
 
 QRectF UBSelectionFrame::boundingRect() const
 {
-    return rect().adjusted(-mThickness, -mThickness, mThickness, mThickness);
+    return rect().adjusted(-adjThickness(), -adjThickness(), adjThickness(), adjThickness());
 }
 
 QPainterPath UBSelectionFrame::shape() const
 {
     QPainterPath resShape;
     QRectF ownRect = rect();
-    QRectF shRect = ownRect.adjusted(-mThickness, -mThickness, mThickness, mThickness);
+    QRectF shRect = ownRect.adjusted(-adjThickness(), -adjThickness(), adjThickness(), adjThickness());
-    resShape.addRoundedRect(shRect, mThickness / 2, mThickness / 2);
+    resShape.addRoundedRect(shRect, adjThickness() / 2, adjThickness() / 2);
 
     if (rect().width() > 1 && rect().height() > 1) {
         QPainterPath extruded;
@@ -89,6 +90,8 @@ void UBSelectionFrame::setEnclosedItems(const QList<QGraphicsItem*> pGraphicsIte
 {
     mButtons.clear();
     mButtons.append(mDeleteButton);
+    mButtons.append(mZOrderUpButton);
+    mButtons.append(mZOrderDownButton);
 
     QRegion resultRegion;
     mEnclosedtems.clear();
@@ -186,8 +189,15 @@ void UBSelectionFrame::mouseReleaseEvent(QGraphicsSceneMouseEvent */*event*/)
 
 void UBSelectionFrame::onZoomChanged(qreal pZoom)
 {
-//    mAntiscaleRatio = pZoom;
+    qDebug() << "Pzoom" << pZoom;
+    qDebug() << "Board current zoom" << UBApplication::boardController->currentZoom();
+    qDebug() << "UBApplication::boardController->systemScaleFactor()" << UBApplication::boardController->systemScaleFactor();
+    mAntiscaleRatio = 1 / (UBApplication::boardController->systemScaleFactor() * pZoom);
 //    updateScale();
+//    QTransform tr;
+//    tr.scale(mAntiscaleRatio, mAntiscaleRatio);
+
+//    this->setTransform(tr);
 }
 
 void UBSelectionFrame::remove()
@@ -206,55 +216,38 @@ void UBSelectionFrame::translateItem(QGraphicsItem */*item*/, const QPointF &/*t
 void UBSelectionFrame::placeButtons()
 {
     QTransform tr;
-//    tr.scale(mAntiScaleRatio, mAntiScaleRatio);
+    tr.scale(mAntiscaleRatio, mAntiscaleRatio);
-
     mDeleteButton->setParentItem(this);
-//    mDeleteButton->setTransform(tr);
+    mDeleteButton->setTransform(tr);
 
-    qreal topX = rect().left() - mDeleteButton->renderer()->viewBox().width() /** mAntiScaleRatio*/ * 1.2;
+    QRectF frRect = boundingRect();
-    qreal topY = rect().top() - mDeleteButton->renderer()->viewBox().height() /** mAntiScaleRatio*/ * 1.2;
 
-    qreal bottomX = rect().left() - mDeleteButton->renderer()->viewBox().width() /** mAntiScaleRatio*/ / 2;
+    qreal topX = frRect.left() - mDeleteButton->renderer()->viewBox().width() * mAntiscaleRatio / 2;
-    qreal bottomY = rect().bottom() - mDeleteButton->renderer()->viewBox().height() /** mAntiScaleRatio*/ / 2;
+    qreal topY = frRect.top() - mDeleteButton->renderer()->viewBox().height() * mAntiscaleRatio / 2;
 
-    mDeleteButton->setPos(topX, topY);
+    qreal bottomX = topX;
-//    mDeleteButton->setPos(0, 0);
+    qreal bottomY = frRect.bottom() - mDeleteButton->renderer()->viewBox().height() * mAntiscaleRatio / 2;
 
-//    if (!mDeleteButton->scene())
+    mDeleteButton->setPos(topX, topY);
-//    {
-//        if (scene())
-//            scene()->addItem(mDeleteButton);
-//    }
     mDeleteButton->show();
 
-//    if (showUpdated)
+    int i = 1, j = 0, k = 0;
-//        mDeleteButton->show();
+    while ((i + j + k) < mButtons.size())  {
-
+        DelegateButton* button = mButtons[i + j];
-//    int i = 1, j = 0, k = 0;
+
-//    while ((i + j + k) < mButtons.size())  {
+        if (button->getSection() == Qt::TopLeftSection) {
-//        DelegateButton* button = mButtons[i + j];
+            button->setParentItem(this);
-
+            button->setPos(topX + (i++ * 1.6 * adjThickness()), topY);
-//        if (button->getSection() == Qt::TopLeftSection) {
+            button->setTransform(tr);
-//            button->setParentItem(mFrame);
+        } else if (button->getSection() == Qt::BottomLeftSection) {
-//            button->setPos(topX + (i++ * 1.6 * mFrameWidth * mAntiScaleRatio), topY);
+            button->setParentItem(this);
-//            button->setTransform(tr);
+            button->setPos(bottomX + (++j * 1.6 * adjThickness()), bottomY);
-//        } else if (button->getSection() == Qt::BottomLeftSection) {
+            button->setTransform(tr);
-//            button->setParentItem(mFrame);
+        } else {
-//            button->setPos(bottomX + (++j * 1.6 * mFrameWidth * mAntiScaleRatio), bottomY);
+            ++k;
-//            button->setTransform(tr);
+        }
-//        } else if (button->getSection() == Qt::TitleBarArea || button->getSection() == Qt::NoSection){
+            button->show();
-//            ++k;
+    }
-//        }
-//        if (!button->scene())
-//        {
-//            if (mDelegated->scene())
-//                mDelegated->scene()->addItem(button);
-//        }
-//        if (showUpdated) {
-//            button->show();
-//            button->setZValue(delegated()->zValue());
-//        }
-//    }
 }
 
 void UBSelectionFrame::clearButtons()

src/domain/UBSelectionFrame.h

@@ -40,6 +40,7 @@ private:
     void translateItem(QGraphicsItem *item, const QPointF &translatePoint);
     void placeButtons();
     void clearButtons();
+    inline int adjThickness() const {return mThickness * mAntiscaleRatio;}
 
 private:
     int mThickness;