MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When using the system OSK, don't show/hide the inbuilt OSK when switching modes

Browse Source
preferencesAboutTextFull
Craig Watson 9 years ago
parent 13a471168a
commit 468373292c
1 changed files with 16 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      src/board/UBBoardPaletteManager.cpp

24
src/board/UBBoardPaletteManager.cpp
Unescape View File

@ -664,11 +664,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mRightPalette->assignParent(mContainer); mRightPalette->assignParent(mContainer);
mRightPalette->stackUnder(mStylusPalette); mRightPalette->stackUnder(mStylusPalette);
mLeftPalette->stackUnder(mStylusPalette); mLeftPalette->stackUnder(mStylusPalette);
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) if (UBPlatformUtils::hasVirtualKeyboard()
&& mKeyboardPalette != NULL
&& UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
{ {
if(mKeyboardPalette->m_isVisible) {
if(mKeyboardPalette->m_isVisible)
{
mKeyboardPalette->hide(); mKeyboardPalette->hide();
mKeyboardPalette->setParent(UBApplication::boardController->controlContainer()); mKeyboardPalette->setParent(UBApplication::boardController->controlContainer());
mKeyboardPalette->show(); mKeyboardPalette->show();
@ -698,7 +698,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
mStylusPalette->raise(); mStylusPalette->raise();
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) if (UBPlatformUtils::hasVirtualKeyboard()
&& mKeyboardPalette != NULL
&& UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
{ {
if(mKeyboardPalette->m_isVisible) if(mKeyboardPalette->m_isVisible)
@ -745,7 +747,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
case eUBDockPaletteWidget_WEB: case eUBDockPaletteWidget_WEB:
{ {
mAddItemPalette->setParent(UBApplication::mainWindow); mAddItemPalette->setParent(UBApplication::mainWindow);
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) if (UBPlatformUtils::hasVirtualKeyboard()
&& mKeyboardPalette != NULL
&& UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
{ {
// tmp variable? // tmp variable?
// WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser(); // WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser();
@ -769,7 +773,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mRightPalette->setVisible(rightPaletteVisible); mRightPalette->setVisible(rightPaletteVisible);
mLeftPalette->assignParent(UBApplication::documentController->controlView()); mLeftPalette->assignParent(UBApplication::documentController->controlView());
mRightPalette->assignParent(UBApplication::documentController->controlView()); mRightPalette->assignParent(UBApplication::documentController->controlView());
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) if (UBPlatformUtils::hasVirtualKeyboard()
&& mKeyboardPalette != NULL
&& UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
{ {
if(mKeyboardPalette->m_isVisible) if(mKeyboardPalette->m_isVisible)
@ -792,7 +798,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mRightPalette->setVisible(rightPaletteVisible); mRightPalette->setVisible(rightPaletteVisible);
mLeftPalette->assignParent(0); mLeftPalette->assignParent(0);
mRightPalette->assignParent(0); mRightPalette->assignParent(0);
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) if (UBPlatformUtils::hasVirtualKeyboard()
&& mKeyboardPalette != NULL
&& UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
{ {
if(mKeyboardPalette->m_isVisible) if(mKeyboardPalette->m_isVisible)

Write Preview
Loading…
Cancel
Save