Commit 3fb1e75c authored by shibakaneki's avatar shibakaneki

Did a better implementation of this fix

parent 3ef2b223
...@@ -109,8 +109,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) ...@@ -109,8 +109,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
connect(mDesktopPalette, SIGNAL(windowClick()), this, SLOT(onToolClicked())); connect(mDesktopPalette, SIGNAL(windowClick()), this, SLOT(onToolClicked()));
connect(mDesktopPalette, SIGNAL(screenClick()), this, SLOT(screenCapture())); connect(mDesktopPalette, SIGNAL(screenClick()), this, SLOT(screenCapture()));
connect(mDesktopPalette, SIGNAL(screenClick()), this, SLOT(onToolClicked())); connect(mDesktopPalette, SIGNAL(screenClick()), this, SLOT(onToolClicked()));
connect(mDesktopPalette, SIGNAL(pointerClick()), this, SLOT(onToolClicked())); connect(UBApplication::mainWindow->actionPointer, SIGNAL(triggered()), this, SLOT(onToolClicked()));
connect(mDesktopPalette, SIGNAL(arrowClicked()), this, SLOT(onToolClicked())); connect(UBApplication::mainWindow->actionSelector, SIGNAL(triggered()), this, SLOT(onToolClicked()));
connect(mDesktopPalette, SIGNAL(maximized()), this, SLOT(onDesktopPaletteMaximized())); connect(mDesktopPalette, SIGNAL(maximized()), this, SLOT(onDesktopPaletteMaximized()));
connect(mDesktopPalette, SIGNAL(minimizeStart(eMinimizedLocation)), this, SLOT(onDesktopPaletteMinimize())); connect(mDesktopPalette, SIGNAL(minimizeStart(eMinimizedLocation)), this, SLOT(onDesktopPaletteMinimize()));
......
...@@ -39,9 +39,6 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent) ...@@ -39,9 +39,6 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent)
actions << UBApplication::mainWindow->actionSelector; actions << UBApplication::mainWindow->actionSelector;
actions << UBApplication::mainWindow->actionPointer; actions << UBApplication::mainWindow->actionPointer;
connect(UBApplication::mainWindow->actionPointer, SIGNAL(triggered()), this, SIGNAL(pointerClick()));
connect(UBApplication::mainWindow->actionSelector, SIGNAL(triggered()), this, SIGNAL(arrowClicked()));
if (UBPlatformUtils::hasVirtualKeyboard()) if (UBPlatformUtils::hasVirtualKeyboard())
actions << UBApplication::mainWindow->actionVirtualKeyboard; actions << UBApplication::mainWindow->actionVirtualKeyboard;
......
...@@ -33,8 +33,6 @@ class UBDesktopPalette : public UBActionPalette ...@@ -33,8 +33,6 @@ class UBDesktopPalette : public UBActionPalette
void customClick(); void customClick();
void windowClick(); void windowClick();
void screenClick(); void screenClick();
void pointerClick();
void arrowClicked();
#ifdef Q_WS_X11 #ifdef Q_WS_X11
void refreshMask(); void refreshMask();
......
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