Commit 6a04b701 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

retina support

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57284 954022d7-b5bf-4e40-9824-e11837661b57
parent d2a8125f
...@@ -149,8 +149,8 @@ void CNativeCtrl::paintGL() ...@@ -149,8 +149,8 @@ void CNativeCtrl::paintGL()
1); 1);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
GLfloat _width = this->width(); GLfloat _width = this->width() * this->devicePixelRatio();
GLfloat _height = this->height(); GLfloat _height = this->height() * this->devicePixelRatio();
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
...@@ -255,12 +255,12 @@ void CNativeCtrl::paintGL() ...@@ -255,12 +255,12 @@ void CNativeCtrl::paintGL()
FILE* file = fopen("/home/oleg/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents/DesktopEditor/log.txt", "a+"); FILE* file = fopen("/home/oleg/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents/DesktopEditor/log.txt", "a+");
fprintf(file, "time: %d\n", (int)(dwTime2 - dwTime1)); fprintf(file, "time: %d\n", (int)(dwTime2 - dwTime1));
fclose(file); fclose(file);
*/
} }
void CNativeCtrl::resizeGL(int width, int height) void CNativeCtrl::resizeGL(int width, int height)
{ {
m_pWrapper->Resize(this->width(), this->height()); int nDevicePixelRatio = this->devicePixelRatio();
m_pWrapper->Resize(this->width() * nDevicePixelRatio, this->height() * nDevicePixelRatio);
} }
void CNativeCtrl::closeEvent(QCloseEvent* e) void CNativeCtrl::closeEvent(QCloseEvent* e)
...@@ -271,8 +271,8 @@ void CNativeCtrl::closeEvent(QCloseEvent* e) ...@@ -271,8 +271,8 @@ void CNativeCtrl::closeEvent(QCloseEvent* e)
void CNativeCtrl::mousePressEvent(QMouseEvent* e) void CNativeCtrl::mousePressEvent(QMouseEvent* e)
{ {
m_pWrapper->m_oMouseController.X = e->pos().x(); m_pWrapper->m_oMouseController.X = e->pos().x() * this->devicePixelRatio();
m_pWrapper->m_oMouseController.Y = e->pos().y(); m_pWrapper->m_oMouseController.Y = e->pos().y() * this->devicePixelRatio();
Qt::MouseButton button = e->button(); Qt::MouseButton button = e->button();
if (button == Qt::LeftButton) if (button == Qt::LeftButton)
...@@ -293,8 +293,8 @@ void CNativeCtrl::mousePressEvent(QMouseEvent* e) ...@@ -293,8 +293,8 @@ void CNativeCtrl::mousePressEvent(QMouseEvent* e)
} }
void CNativeCtrl::mouseMoveEvent(QMouseEvent* e) void CNativeCtrl::mouseMoveEvent(QMouseEvent* e)
{ {
m_pWrapper->m_oMouseController.X = e->pos().x(); m_pWrapper->m_oMouseController.X = e->pos().x() * this->devicePixelRatio();
m_pWrapper->m_oMouseController.Y = e->pos().y(); m_pWrapper->m_oMouseController.Y = e->pos().y() * this->devicePixelRatio();
Qt::KeyboardModifiers mods = e->modifiers(); Qt::KeyboardModifiers mods = e->modifiers();
...@@ -308,8 +308,8 @@ void CNativeCtrl::mouseMoveEvent(QMouseEvent* e) ...@@ -308,8 +308,8 @@ void CNativeCtrl::mouseMoveEvent(QMouseEvent* e)
void CNativeCtrl::mouseReleaseEvent(QMouseEvent* e) void CNativeCtrl::mouseReleaseEvent(QMouseEvent* e)
{ {
m_pWrapper->m_oMouseController.X = e->pos().x(); m_pWrapper->m_oMouseController.X = e->pos().x() * this->devicePixelRatio();
m_pWrapper->m_oMouseController.Y = e->pos().y(); m_pWrapper->m_oMouseController.Y = e->pos().y() * this->devicePixelRatio();
Qt::MouseButton button = e->button(); Qt::MouseButton button = e->button();
if (button == Qt::LeftButton) if (button == Qt::LeftButton)
......
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