Skip to content

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

Merge remote-tracking branch 'origin/develop' into claudio-dev

parents 24b310b7 e12e9118
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/desktop/UBDesktopPalette.cpp
View file @ fe543da5
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalette) UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalette)
: UBActionPalette(Qt::TopLeftCorner, parent) : UBActionPalette(Qt::TopLeftCorner, parent)
, rightPalette(_rightPalette)
, mShowHideAction(0) , mShowHideAction(0)
, mDisplaySelectAction(0) , mDisplaySelectAction(0)
, rightPalette(_rightPalette)
{ {
QList<QAction*> actions; QList<QAction*> actions;
...@@ -239,4 +239,4 @@ void UBDesktopPalette::parentResized() ...@@ -239,4 +239,4 @@ void UBDesktopPalette::parentResized()
} }
moveInsideParent(p); moveInsideParent(p);
} }
\ No newline at end of file
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