|
|
@ -19,14 +19,13 @@ |
|
|
|
* along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
* along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "UBDisplayManager.h" |
|
|
|
#include "UBDisplayManager.h" |
|
|
|
|
|
|
|
|
|
|
|
#include "frameworks/UBPlatformUtils.h" |
|
|
|
#include "frameworks/UBPlatformUtils.h" |
|
|
|
|
|
|
|
|
|
|
|
#include "core/UBApplication.h" |
|
|
|
#include "core/UBApplication.h" |
|
|
|
#include "core/UBApplicationController.h" |
|
|
|
#include "core/UBApplicationController.h" |
|
|
|
|
|
|
|
#include "core/UBSettings.h" |
|
|
|
|
|
|
|
|
|
|
|
#include "board/UBBoardView.h" |
|
|
|
#include "board/UBBoardView.h" |
|
|
|
|
|
|
|
|
|
|
@ -66,7 +65,7 @@ void UBDisplayManager::initScreenIndexes() |
|
|
|
mControlScreenIndex = mDesktop->primaryScreen(); |
|
|
|
mControlScreenIndex = mDesktop->primaryScreen(); |
|
|
|
if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool()) |
|
|
|
if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
mControlScreenIndex = mControlScreenIndex^1; |
|
|
|
mControlScreenIndex = mControlScreenIndex^1; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
mScreenIndexesRoles << Control; |
|
|
|
mScreenIndexesRoles << Control; |
|
|
@ -90,13 +89,13 @@ void UBDisplayManager::initScreenIndexes() |
|
|
|
|
|
|
|
|
|
|
|
if (screenCount > 2) |
|
|
|
if (screenCount > 2) |
|
|
|
{ |
|
|
|
{ |
|
|
|
for(int i = 2; i < screenCount; i++) |
|
|
|
for(int i = 2; i < screenCount; i++) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if(mControlScreenIndex == i) |
|
|
|
if(mControlScreenIndex == i) |
|
|
|
mPreviousScreenIndexes.append(1); |
|
|
|
mPreviousScreenIndexes.append(1); |
|
|
|
else |
|
|
|
else |
|
|
|
mPreviousScreenIndexes.append(i); |
|
|
|
mPreviousScreenIndexes.append(i); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|