From: GiWoong Kim Date: Tue, 3 Nov 2015 06:31:34 +0000 (+0900) Subject: skin: fix the incorrect decision logic for VM color X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~192 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=891379e1fcf11d14e8f044255be86e0e2f9fff0d;p=sdk%2Femulator%2Fqemu.git skin: fix the incorrect decision logic for VM color Decision logic for VM color(which is used by Pair Tag on skin) is depended on base port number. The port number is increased by 10 from 26100. Change-Id: I8744e837eb77773e9dedf2155abca346498ae211 Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp index 3bc303a376..31c34ab4f3 100644 --- a/tizen/src/ui/qt5_supplement.cpp +++ b/tizen/src/ui/qt5_supplement.cpp @@ -113,6 +113,7 @@ void qt5_gui_init(void) uiInfo->setResolution(QSize( get_display_resolution_width(), get_display_resolution_height())); uiInfo->setBasePort(get_emul_vm_base_port()); + qDebug() << "VM base port:" << uiInfo->getBasePort(); uiInfo->setVmDataPath(QDir( QString::fromLocal8Bit(get_vm_data_path())).canonicalPath()); diff --git a/tizen/src/ui/uiinformation.cpp b/tizen/src/ui/uiinformation.cpp index 603577a901..1fa31d01e8 100644 --- a/tizen/src/ui/uiinformation.cpp +++ b/tizen/src/ui/uiinformation.cpp @@ -78,7 +78,12 @@ UIState *UiInformation::getUiState() QColor UiInformation::getVMColor() { - switch(basePort % 10) { + if (basePort <= 0) { + qWarning() << "invalid base port:" << basePort; + return QColor(255, 0, 0); + } + + switch((basePort / 10) % 10) { case 0: break; case 1: