Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
80c63726
Commit
80c63726
authored
5 years ago
by
Clément Fauconnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "fixed autocompletion error in hasSelection()"
This reverts commit
63e5e8ec
.
parent
63e5e8ec
master
bugfix
1.5.4z3
1.5.4z2
1.5.4z
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
13 deletions
+3
-13
UBGraphicsTextItemDelegate.cpp
src/domain/UBGraphicsTextItemDelegate.cpp
+1
-1
UBGraphicsWidgetItem.cpp
src/domain/UBGraphicsWidgetItem.cpp
+0
-10
UBGraphicsWidgetItem.h
src/domain/UBGraphicsWidgetItem.h
+0
-1
UBGraphicsWidgetItemDelegate.cpp
src/domain/UBGraphicsWidgetItemDelegate.cpp
+2
-1
No files found.
src/domain/UBGraphicsTextItemDelegate.cpp
View file @
80c63726
...
...
@@ -386,7 +386,7 @@ void UBGraphicsTextItemDelegate::pickColor()
curCursor
.
mergeCharFormat
(
format
);
delegated
()
->
setTextCursor
(
curCursor
);
if
(
!
curCursor
.
hasSelection
())
if
(
!
curCursor
.
has
Complex
Selection
())
UBGraphicsTextItem
::
lastUsedTextColor
=
selectedColor
;
delegated
()
->
setSelected
(
true
);
...
...
This diff is collapsed.
Click to expand it.
src/domain/UBGraphicsWidgetItem.cpp
View file @
80c63726
...
...
@@ -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
());
...
...
This diff is collapsed.
Click to expand it.
src/domain/UBGraphicsWidgetItem.h
View file @
80c63726
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
src/domain/UBGraphicsWidgetItemDelegate.cpp
View file @
80c63726
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment