Merge branch 'develop' of github.com:OpenEducationFoundation/OpenBoard into develop

src/core/UBApplication.cpp

@@ -129,13 +129,6 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
         version = version.left(version.length()-1);
     setApplicationVersion(version);
 
-#if defined(Q_WS_MAC) && !defined(QT_NO_DEBUG)
-    CFStringRef shortVersion = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("CFBundleShortVersionString"));
-    const char *version = CFStringGetCStringPtr(shortVersion, kCFStringEncodingMacRoman);
-    Q_ASSERT(version);
-    setApplicationVersion(version);
-#endif
-
     QStringList args = arguments();
 
     mIsVerbose = args.contains("-v")

src/domain/UBGraphicsTextItem.cpp

@@ -39,7 +39,6 @@
 #include "core/UBSettings.h"
 
 #include "core/memcheck.h"
-
 QColor UBGraphicsTextItem::lastUsedTextColor;
 
 UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) :
@@ -47,7 +46,9 @@ UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) :
     , UBGraphicsItem()
     , mMultiClickState(0)
     , mLastMousePressTime(QTime::currentTime())
+    , mTypeTextHereLabel(tr("<Type Text Here>"))
 {
+    mEmptyTextWidth = QFontMetrics(font()).width(mTypeTextHereLabel);
     setDelegate(new UBGraphicsTextItemDelegate(this, 0));
 
     // TODO claudio remove this because in contrast with the fact the frame should be created on demand.
@@ -56,8 +57,6 @@ UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) :
     Delegate()->setUBFlag(GF_FLIPPABLE_ALL_AXIS, false);
     Delegate()->setUBFlag(GF_REVOLVABLE, true);
 
-    mTypeTextHereLabel = tr("<Type Text Here>");
-
     setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
     setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly
 
@@ -247,8 +246,9 @@ void UBGraphicsTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
     if (widget == UBApplication::boardController->controlView()->viewport() &&
             !isSelected() && toPlainText().isEmpty())
     {
-        QFontMetrics fm(font());
+//        QFontMetrics fm(font());
-        setTextWidth(fm.width(mTypeTextHereLabel));
+//        setTextWidth(fm.width(mTypeTextHereLabel));
+
         painter->setFont(font());
         painter->setPen(UBSettings::paletteColor);
         painter->drawText(boundingRect(), Qt::AlignCenter, mTypeTextHereLabel);
@@ -307,7 +307,6 @@ QPainterPath UBGraphicsTextItem::shape() const
 
 void UBGraphicsTextItem::setTextWidth(qreal width)
 {
-    QFontMetrics fm(font());
     qreal strictMin = 155; // the size of the font customization panel
     qreal newWidth = qMax(strictMin, width);
 

src/domain/UBGraphicsTextItem.h

@@ -98,6 +98,9 @@ class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBRes
 
         void setSelected(bool selected);
 
+        QString mTypeTextHereLabel;
+        int mEmptyTextWidth;
+
     signals:
         void textUndoCommandAdded(UBGraphicsTextItem *textItem);
 
@@ -121,7 +124,6 @@ class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBRes
 
         int mMultiClickState;
         QTime mLastMousePressTime;
-        QString mTypeTextHereLabel;
 
         QColor mColorOnDarkBackground;
         QColor mColorOnLightBackground;

src/domain/UBGraphicsTextItemDelegate.cpp

@@ -652,16 +652,16 @@ void UBGraphicsTextItemDelegate::updateAlighButtonState()
     }
 
     asAlBtn->setMixedButtonVisible(false);
-    switch (static_cast<int>(delegated()->textCursor().blockFormat().alignment())) {
+
-    case Qt::AlignCenter :
+    Qt::Alignment cf = delegated()->textCursor().blockFormat().alignment();
+    qDebug() << "getting alignment" << cf;
+
+    if (cf & Qt::AlignCenter) {
         asAlBtn->setKind(AlignTextButton::k_center);
-        break;
+    } else if (cf & Qt::AlignRight) {
-    case Qt::AlignRight :
         asAlBtn->setKind(AlignTextButton::k_right);
-        break;
+    } else {
-    default:
         asAlBtn->setKind(AlignTextButton::k_left);
-        break;
     }
 }
 
@@ -726,5 +726,11 @@ QVariant UBGraphicsTextItemDelegate::itemChange(QGraphicsItem::GraphicsItemChang
             }
         }
     }
+
+    if (value.toBool() == false && delegated()->document()->toPlainText().isEmpty()) {
+        int wdth = QFontMetrics(delegated()->font()).width(delegated()->mTypeTextHereLabel);
+        delegated()->setTextWidth(qMax(wdth, (int)(delegated()->textWidth())));
+    }
+
     return UBGraphicsItemDelegate::itemChange(change, value);
 }