Fixed bug on linux: after maximazing the palette doesn't update the mask. Fixed issue: http://188.165.53.52/jira/browse/SANKORE-117

preferencesAboutTextFull
Claudio Valerio 13 years ago
parent a4d36f9e81
commit 424dc1d89d
  1. 1
      src/desktop/UBDesktopAnnotationController.cpp
  2. 13
      src/desktop/UBDesktopPalette.cpp
  3. 5
      src/desktop/UBDesktopPalette.h

@ -104,6 +104,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
connect(mKeyboardPalette, SIGNAL(keyboardActivated(bool)), mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool))); connect(mKeyboardPalette, SIGNAL(keyboardActivated(bool)), mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool)));
#ifdef Q_WS_X11 #ifdef Q_WS_X11
connect(mKeyboardPalette, SIGNAL(moved(QPoint)), this, SLOT(refreshMask())); connect(mKeyboardPalette, SIGNAL(moved(QPoint)), this, SLOT(refreshMask()));
connect(mDesktopPalette,SIGNAL(refreshMask()), this, SLOT(refreshMask()));
#endif #endif
} }

@ -136,8 +136,11 @@ void UBDesktopPalette::minimizeMe(eMinimizedLocation location)
actions << mMaximizeAction; actions << mMaximizeAction;
setActions(actions); setActions(actions);
QSize newSize = preferredSize(); adjustSizeAndPosition();
this->resize(newSize);
#ifdef Q_WS_X11
emit refreshMask();
#endif
} }
// Called when the user wants to maximize the palette // Called when the user wants to maximize the palette
@ -161,11 +164,13 @@ void UBDesktopPalette::maximizeMe()
setActions(actions); setActions(actions);
QSize newSize = preferredSize(); adjustSizeAndPosition();
this->resize(newSize);
// Notify that the maximization has been done // Notify that the maximization has been done
emit maximized(); emit maximized();
#ifdef Q_WS_X11
emit refreshMask();
#endif
} }
void UBDesktopPalette::showEvent(QShowEvent *event) void UBDesktopPalette::showEvent(QShowEvent *event)

@ -33,7 +33,10 @@ class UBDesktopPalette : public UBActionPalette
void customClick(); void customClick();
void windowClick(); void windowClick();
void screenClick(); void screenClick();
// void showVirtualKeyboard(bool);
#ifdef Q_WS_X11
void refreshMask();
#endif
public slots: public slots:

Loading…
Cancel
Save