Commit 8123279b authored by Claudio Valerio's avatar Claudio Valerio

the desktop palette is moved at least a 30px from the top boarder in oder to...

the desktop palette is moved at least a 30px from the top boarder in oder to not overlap top bar on mac
parent 7231d783
......@@ -101,6 +101,15 @@ UBDesktopPalette::~UBDesktopPalette()
}
void UBDesktopPalette::adjustPosition()
{
QPoint pos = this->pos();
if(this->pos().y() < 30){
pos.setY(30);
moveInsideParent(pos);
}
}
void UBDesktopPalette::disappearForCapture()
{
setWindowOpacity(0.0);
......@@ -209,6 +218,7 @@ void UBDesktopPalette::showEvent(QShowEvent *event)
eraserIcon.addPixmap(QPixmap(":images/stylusPalette/eraserOnArrow.png"), QIcon::Normal, QIcon::On);
UBApplication::mainWindow->actionEraser->setIcon(eraserIcon);
adjustPosition();
}
void UBDesktopPalette::hideEvent(QHideEvent *event)
......
......@@ -35,7 +35,7 @@
*/
class UBDesktopPalette : public UBActionPalette
{
Q_OBJECT;
Q_OBJECT
public:
UBDesktopPalette(QWidget *parent, UBRightPalette* rightPalette);
......@@ -71,7 +71,7 @@ protected:
virtual int getParentRightOffset();
private:
private:
QAction *mShowHideAction;
QAction *mDisplaySelectAction;
QAction *mMaximizeAction;
......@@ -81,8 +81,10 @@ protected:
UBRightPalette* rightPalette;
void adjustPosition();
signals:
signals:
void stylusToolChanged(int tool);
};
......
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