From 9177eb405d902acad5ec292721bcc8dd4249f9fc Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Mar 2012 12:50:07 +0200 Subject: [PATCH 1/2] fixed img search --- resources/library/search/ImgSearch.wgs/css/basic.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/library/search/ImgSearch.wgs/css/basic.css b/resources/library/search/ImgSearch.wgs/css/basic.css index 85ce2b55..75818641 100755 --- a/resources/library/search/ImgSearch.wgs/css/basic.css +++ b/resources/library/search/ImgSearch.wgs/css/basic.css @@ -43,7 +43,7 @@ body{ border-bottom-right-radius: 15px; border: solid 4px #EEEEEE; border-top: none; - z-index: 10; + z-index: 101; } .togglePages{ @@ -61,6 +61,7 @@ body{ -webkit-box-shadow: #dadada -1px 0 4px; box-shadow: #dadada -1px 0 4px; cursor: pointer; + z-index: 100; } .toggleIcon{ From feae4a952236ed0d4a8e86199fe7938b892dd56d Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 23 Mar 2012 16:30:16 +0200 Subject: [PATCH 2/2] Virtual keyboard desktop mac issue --- src/board/UBBoardPaletteManager.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index b029d2b7..65693ed4 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -674,11 +674,18 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); #else mKeyboardPalette->setParent(0); +#endif +#ifdef Q_WS_MAC + mKeyboardPalette->setWindowFlags(Qt::Dialog | Qt::Popup | Qt::FramelessWindowHint); #endif mKeyboardPalette->show(); } else mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); +#ifdef Q_WS_MAC + mKeyboardPalette->setWindowFlags(Qt::Dialog | Qt::Popup | Qt::FramelessWindowHint); +#endif + } mLeftPalette->setVisible(leftPaletteVisible);