From 80c63726f273929500cfc04b044d8159ab77becf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Fri, 19 Jul 2019 09:17:54 +0200 Subject: [PATCH] Revert "fixed autocompletion error in hasSelection()" This reverts commit 63e5e8ecf4ddcc67b0818091b62d4f7230d5799e. --- src/domain/UBGraphicsTextItemDelegate.cpp | 2 +- src/domain/UBGraphicsWidgetItem.cpp | 10 ---------- src/domain/UBGraphicsWidgetItem.h | 1 - src/domain/UBGraphicsWidgetItemDelegate.cpp | 3 ++- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp index 3d05f1c7..a72b32d8 100644 --- a/src/domain/UBGraphicsTextItemDelegate.cpp +++ b/src/domain/UBGraphicsTextItemDelegate.cpp @@ -386,7 +386,7 @@ void UBGraphicsTextItemDelegate::pickColor() curCursor.mergeCharFormat(format); delegated()->setTextCursor(curCursor); - if (!curCursor.hasSelection()) + if (!curCursor.hasComplexSelection()) UBGraphicsTextItem::lastUsedTextColor = selectedColor; delegated()->setSelected(true); diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index d6e96b05..0bed044b 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -556,15 +556,6 @@ void UBGraphicsWidgetItem::sendJSLeaveEvent() page()->mainFrame()->evaluateJavaScript("if(widget && widget.onleave) { widget.onleave();}"); } -void UBGraphicsWidgetItem::sendJSResizeEvent() -{ - if (page() && page()->mainFrame()) - { - page()->mainFrame()->evaluateJavaScript("if(widget && widget.onresize) { widget.onresize();}"); - page()->mainFrame()->evaluateJavaScript("if(window && window.onresize) { window.onresize();}"); - } -} - void UBGraphicsWidgetItem::injectInlineJavaScript() { if (!sInlineJavaScriptLoaded) { @@ -663,7 +654,6 @@ void UBGraphicsWidgetItem::resize(qreal w, qreal h) void UBGraphicsWidgetItem::resize(const QSizeF & pSize) { - sendJSResizeEvent(); if (pSize != size()) { QGraphicsWebView::setMaximumSize(pSize.width(), pSize.height()); QGraphicsWebView::resize(pSize.width(), pSize.height()); diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h index f7202835..68336a89 100644 --- a/src/domain/UBGraphicsWidgetItem.h +++ b/src/domain/UBGraphicsWidgetItem.h @@ -165,7 +165,6 @@ class UBGraphicsWidgetItem : public QGraphicsWebView, public UBItem, public UBRe virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); virtual void sendJSEnterEvent(); virtual void sendJSLeaveEvent(); - virtual void sendJSResizeEvent(); virtual void injectInlineJavaScript(); virtual void wheelEvent(QGraphicsSceneWheelEvent *event); virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp index dfe892cf..c6b03628 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.cpp +++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp @@ -44,7 +44,8 @@ #include "core/memcheck.h" UBGraphicsWidgetItemDelegate::UBGraphicsWidgetItemDelegate(UBGraphicsWidgetItem* pDelegated, int widgetType) - : UBGraphicsItemDelegate(pDelegated, 0, GF_SCALABLE_Y_AXIS) + : UBGraphicsItemDelegate(pDelegated, 0, GF_COMMON + | GF_RESPECT_RATIO) , freezeAction(0) , setAsToolAction(0) {