Skip to content

O
OpenBoard
Commit 523d2852 authored by Claudio Valerio's avatar Claudio Valerio
Browse files
Options

Merge branch 'master' of github.com:Sankore/Sankore-3.1

parents a05c266c 09899899
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/board/UBBoardView.cpp
View file @ 523d2852
...@@ -989,7 +989,8 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) ...@@ -989,7 +989,8 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
{ {
if (QGraphicsSvgItem::Type != movingItem->type() && if (QGraphicsSvgItem::Type != movingItem->type() &&
UBGraphicsDelegateFrame::Type != movingItem->type() && UBGraphicsDelegateFrame::Type != movingItem->type() &&
UBToolWidget::Type != movingItem->type()) UBToolWidget::Type != movingItem->type() &&
QGraphicsWidget::Type != movingItem->type())
{ {
bReleaseIsNeed = false; bReleaseIsNeed = false;
if (movingItem->isSelected() && mMultipleSelectionIsEnabled) if (movingItem->isSelected() && mMultipleSelectionIsEnabled)
......
src/gui/UBToolWidget.cpp
View file @ 523d2852
...@@ -76,7 +76,7 @@ void UBToolWidget::initialize() ...@@ -76,7 +76,7 @@ void UBToolWidget::initialize()
if(!sUnpinPixmap) if(!sUnpinPixmap)
sUnpinPixmap = new QPixmap(":/images/unpin.svg"); sUnpinPixmap = new QPixmap(":/images/unpin.svg");
QGraphicsLinearLayout *graphicsLayout = new QGraphicsLinearLayout(Qt::Vertical); QGraphicsLinearLayout *graphicsLayout = new QGraphicsLinearLayout(Qt::Vertical, this);
mFrameWidth = UBSettings::settings()->objectFrameWidth; mFrameWidth = UBSettings::settings()->objectFrameWidth;
mContentMargin = sClosePixmap->width() / 2 + mFrameWidth; mContentMargin = sClosePixmap->width() / 2 + mFrameWidth;
......
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