Fixed issue Sankore-31

preferencesAboutTextFull
shibakaneki 14 years ago
parent 27b93bb24d
commit d876b38764
  1. 7
      src/core/UBApplication.cpp
  2. 1
      src/desktop/UBDesktopAnnotationController.cpp
  3. 4
      src/frameworks/UBPlatformUtils_mac.mm

@ -62,6 +62,9 @@ const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.mne
const QString UBApplication::mimeTypeUniboardPageItem = QString("application/vnd.mnemis-uniboard-page-item"); const QString UBApplication::mimeTypeUniboardPageItem = QString("application/vnd.mnemis-uniboard-page-item");
const QString UBApplication::mimeTypeUniboardPageThumbnail = QString("application/vnd.mnemis-uniboard-thumbnail"); const QString UBApplication::mimeTypeUniboardPageThumbnail = QString("application/vnd.mnemis-uniboard-thumbnail");
#ifdef Q_WS_MAC
bool bIsMinimized = false;
#endif
QObject* UBApplication::staticMemoryCleaner = 0; QObject* UBApplication::staticMemoryCleaner = 0;
@ -308,6 +311,7 @@ int UBApplication::exec(const QString& pFileToImport)
void UBApplication::showMinimized() void UBApplication::showMinimized()
{ {
mainWindow->hide(); mainWindow->hide();
bIsMinimized = true;
} }
#endif #endif
@ -496,8 +500,9 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event)
} }
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
if (event->type() == QEvent::ApplicationActivate){ if (bIsMinimized && event->type() == QEvent::ApplicationActivate){
if (mainWindow->isHidden()) mainWindow->show(); if (mainWindow->isHidden()) mainWindow->show();
bIsMinimized = false;
} }
#endif #endif
return result; return result;

@ -114,7 +114,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
if (UBPlatformUtils::hasVirtualKeyboard()) if (UBPlatformUtils::hasVirtualKeyboard())
{ {
mKeyboardPalette = UBKeyboardPalette::create(mTransparentDrawingView); mKeyboardPalette = UBKeyboardPalette::create(mTransparentDrawingView);
connect(mKeyboardPalette, SIGNAL(keyboardActivated(bool)), mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool))); connect(mKeyboardPalette, SIGNAL(keyboardActivated(bool)), mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool)));
} }

@ -211,7 +211,9 @@ void UBPlatformUtils::disableShadow(QWidget *widget)
widget->winId(); widget->winId();
ChangeWindowAttributes(qt_mac_window_for(widget), kWindowNoShadowAttribute, kWindowNoAttributes); ChangeWindowAttributes(qt_mac_window_for(widget), kWindowNoShadowAttribute, kWindowNoAttributes);
#else #else
Q_UNUSED(widget); NSView* view = (NSView*)widget->winId();
NSWindow* window = [view window];
[window setHasShadow:NO];
#endif #endif
} }

Loading…
Cancel
Save