Commit c28c9718 authored by Claudio Valerio's avatar Claudio Valerio

some estitics

parent 872e2ee9
...@@ -308,7 +308,6 @@ UBBoardView::event (QEvent * e) ...@@ -308,7 +308,6 @@ UBBoardView::event (QEvent * e)
if (gestureEvent) if (gestureEvent)
{ {
QSwipeGesture* swipe = dynamic_cast<QSwipeGesture*> (gestureEvent->gesture (Qt::SwipeGesture)); QSwipeGesture* swipe = dynamic_cast<QSwipeGesture*> (gestureEvent->gesture (Qt::SwipeGesture));
if (swipe) if (swipe)
{ {
if (swipe->horizontalDirection () == QSwipeGesture::Left) if (swipe->horizontalDirection () == QSwipeGesture::Left)
...@@ -363,9 +362,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event) ...@@ -363,9 +362,7 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
QPointF scenePos = viewportTransform ().inverted ().map (tabletPos); QPointF scenePos = viewportTransform ().inverted ().map (tabletPos);
qreal pressure = 1.0; qreal pressure = 1.0;
if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) if (((currentTool == UBStylusTool::Pen || currentTool == UBStylusTool::Line) && mPenPressureSensitive) || (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
&& mPenPressureSensitive)
|| (currentTool == UBStylusTool::Marker && mMarkerPressureSensitive))
pressure = event->pressure (); pressure = event->pressure ();
......
...@@ -582,8 +582,8 @@ bool UBGraphicsScene::inputDeviceRelease() ...@@ -582,8 +582,8 @@ bool UBGraphicsScene::inputDeviceRelease()
addItem(pStrokes); addItem(pStrokes);
mDrawWithCompass = false; mDrawWithCompass = false;
}else if (mCurrentStroke) }
{ else if (mCurrentStroke){
UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup(); UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup();
// Remove the strokes that were just drawn here and replace them by a stroke item // Remove the strokes that were just drawn here and replace them by a stroke item
......
...@@ -563,10 +563,8 @@ void UBGraphicsWidgetItem::injectInlineJavaScript() ...@@ -563,10 +563,8 @@ void UBGraphicsWidgetItem::injectInlineJavaScript()
void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
if(!scene() || !scene()->renderingContext())
return;
if (scene()->renderingContext() != UBGraphicsScene::Screen) if (scene() && scene()->renderingContext() != UBGraphicsScene::Screen)
{ {
painter->drawPixmap(0, 0, snapshot()); painter->drawPixmap(0, 0, snapshot());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment