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
dabaca53
Commit
dabaca53
authored
Jan 29, 2014
by
-f
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
on zlevel changed the frame operation mode is reset to resize instead of scale
parent
5cf43207
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
UBGraphicsDelegateFrame.cpp
src/domain/UBGraphicsDelegateFrame.cpp
+3
-3
UBGraphicsItemTransformUndoCommand.h
src/domain/UBGraphicsItemTransformUndoCommand.h
+0
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+1
-3
UBGraphicsTextItemDelegate.cpp
src/domain/UBGraphicsTextItemDelegate.cpp
+5
-0
No files found.
src/domain/UBGraphicsDelegateFrame.cpp
View file @
dabaca53
...
@@ -443,8 +443,8 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
...
@@ -443,8 +443,8 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
mScaleY
=
scaleY
;
mScaleY
=
scaleY
;
}
}
}
}
}
else
if
(
resizingLeft
()
||
resizingRight
())
}
{
else
if
(
resizingLeft
()
||
resizingRight
())
{
if
(
width
!=
0
){
if
(
width
!=
0
){
qreal
scaleX
=
0.0
;
qreal
scaleX
=
0.0
;
if
(
resizingLeft
()){
if
(
resizingLeft
()){
...
...
src/domain/UBGraphicsItemTransformUndoCommand.h
View file @
dabaca53
...
@@ -30,7 +30,6 @@
...
@@ -30,7 +30,6 @@
#include <QtGui>
#include <QtGui>
#include "UBResizableGraphicsItem.h"
#include "UBUndoCommand.h"
#include "UBUndoCommand.h"
...
...
src/domain/UBGraphicsScene.cpp
View file @
dabaca53
...
@@ -257,9 +257,7 @@ qreal UBZLayerController::changeZLevelTo(QGraphicsItem *item, moveDestination de
...
@@ -257,9 +257,7 @@ qreal UBZLayerController::changeZLevelTo(QGraphicsItem *item, moveDestination de
foreach
(
QGraphicsItem
*
iitem
,
sortedItems
.
values
())
{
foreach
(
QGraphicsItem
*
iitem
,
sortedItems
.
values
())
{
if
(
iitem
)
if
(
iitem
)
iitem
!=
item
iitem
!=
item
?
qDebug
()
<<
"current value"
<<
iitem
->
zValue
()
:
qDebug
()
<<
"marked value"
<<
QString
::
number
(
iitem
->
zValue
(),
'f'
);
?
qDebug
()
<<
"current value"
<<
iitem
->
zValue
()
:
qDebug
()
<<
"marked value"
<<
QString
::
number
(
iitem
->
zValue
(),
'f'
);
}
}
//Return new z value assigned to item
//Return new z value assigned to item
...
...
src/domain/UBGraphicsTextItemDelegate.cpp
View file @
dabaca53
...
@@ -195,6 +195,11 @@ void UBGraphicsTextItemDelegate::createControls()
...
@@ -195,6 +195,11 @@ void UBGraphicsTextItemDelegate::createControls()
button
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
button
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
}
}
// Claudio: on changing the zvlaue the frame is updated updateSelectionFrame and
// the default value for the operation mode is set (scaling). This isn't the right
// mode for text so we call that here.
frame
()
->
setOperationMode
(
UBGraphicsDelegateFrame
::
Resizing
);
}
}
...
...
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