Commit 006b3dc7 authored by Chupligin Sergey's avatar Chupligin Sergey

[Sizing] fix db scale

parent b5bfdc9c
...@@ -29,13 +29,13 @@ Sizing::Sizing(QObject *parent) : QObject(parent) ...@@ -29,13 +29,13 @@ Sizing::Sizing(QObject *parent) : QObject(parent)
}else if(m_dpi >= 140 && m_dpi < 200){ }else if(m_dpi >= 140 && m_dpi < 200){
//~160dpi //~160dpi
m_densitie = mdpi; m_densitie = mdpi;
}else if(m_dpi >= 200 && m_dpi < 280){ }else if(m_dpi >= 200 && m_dpi < 300){
//~240dpi //~240dpi
m_densitie = hdpi; m_densitie = hdpi;
}else if(m_dpi >= 280 && m_dpi < 400){ }else if(m_dpi >= 300 && m_dpi < 420){
//~320dpi //~320dpi
m_densitie = xhdpi; m_densitie = xhdpi;
}else if(m_dpi >= 400 && m_dpi < 560){ }else if(m_dpi >= 420 && m_dpi < 560){
//~480dpi //~480dpi
m_densitie = xxhdpi; m_densitie = xxhdpi;
}else{ }else{
...@@ -45,7 +45,6 @@ Sizing::Sizing(QObject *parent) : QObject(parent) ...@@ -45,7 +45,6 @@ Sizing::Sizing(QObject *parent) : QObject(parent)
if(m_p_height > 0 && m_p_width >0){ if(m_p_height > 0 && m_p_width >0){
m_valid = true; m_valid = true;
setMmScaleFactor(); setMmScaleFactor();
setDpScaleFactor();
}else{ }else{
if(m_p_height == 0){ if(m_p_height == 0){
qWarning("QT_QPA_EGLFS_PHYSICAL_HEIGHT is not set!"); qWarning("QT_QPA_EGLFS_PHYSICAL_HEIGHT is not set!");
...@@ -56,6 +55,7 @@ Sizing::Sizing(QObject *parent) : QObject(parent) ...@@ -56,6 +55,7 @@ Sizing::Sizing(QObject *parent) : QObject(parent)
} }
qWarning("Device mm sizing don`t work"); qWarning("Device mm sizing don`t work");
} }
setDpScaleFactor();
} }
void Sizing::setMmScaleFactor() void Sizing::setMmScaleFactor()
...@@ -80,7 +80,7 @@ void Sizing::setDpScaleFactor() ...@@ -80,7 +80,7 @@ void Sizing::setDpScaleFactor()
m_dp_factor = 1; m_dp_factor = 1;
break; break;
case xhdpi: case xhdpi:
m_dp_factor = 1.3; m_dp_factor = 1.5;
break; break;
case xxhdpi: case xxhdpi:
m_dp_factor = 2; m_dp_factor = 2;
...@@ -89,7 +89,7 @@ void Sizing::setDpScaleFactor() ...@@ -89,7 +89,7 @@ void Sizing::setDpScaleFactor()
m_dp_factor = 2.5; m_dp_factor = 2.5;
break; break;
default: default:
m_dp_factor = 1.3; m_dp_factor = 1.5;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment