From 864b14d2dbdb99b15332e445fc75740f26225467 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Wed, 22 May 2013 16:28:29 +0300 Subject: [PATCH] [qt] Support for high-DPI devices like Chromebook Pixel --- qt/draw_widget.cpp | 8 +++++++- qt/qt.pro | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 7eff7d7312..619b0c4512 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -251,9 +251,13 @@ namespace qt rpParams.m_useDefaultFB = true; rpParams.m_rmParams = rmParams; rpParams.m_primaryRC = primaryRC; - rpParams.m_density = graphics::EDensityMDPI; rpParams.m_skinName = "basic.skn"; + if (QApplication::desktop()->physicalDpiX() < 180) + rpParams.m_density = graphics::EDensityMDPI; + else + rpParams.m_density = graphics::EDensityXHDPI; + try { m_framework->SetRenderPolicy(CreateRenderPolicy(rpParams)); @@ -323,7 +327,9 @@ namespace qt { m_taskX = x; m_taskY = y; +#ifndef OMIM_PRODUCTION m_scheduledTasks.reset(new ScheduledTask(bind(&DrawWidget::OnPressTaskEvent, this, x, y, ms), ms)); +#endif } void DrawWidget::KillPressTask() diff --git a/qt/qt.pro b/qt/qt.pro index f128c4d383..fa99961ef9 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -49,10 +49,13 @@ linux* { } else { CLASSIFICATOR_RES.files += ../data/drules_proto.txt } - SKIN_RES.path = $$RESDIR/resources-mdpi - SKIN_RES.files = ../data/resources-mdpi/basic.skn ../data/resources-mdpi/symbols.png + MDPI_SKIN_RES.path = $$RESDIR/resources-mdpi + MDPI_SKIN_RES.files = ../data/resources-mdpi/basic.skn ../data/resources-mdpi/symbols.png + XHDPI_SKIN_RES.path = $$RESDIR/resources-xhdpi + XHDPI_SKIN_RES.files = ../data/resources-xhdpi/basic.skn ../data/resources-xhdpi/symbols.png FONT_RES.path = $$RESDIR - FONT_RES.files = ../data/01_dejavusans.ttf \ + FONT_RES.files = ../data/00_roboto_regular.ttf \ + ../data/01_dejavusans.ttf \ ../data/02_wqy-microhei.ttf \ ../data/03_jomolhari-id-a3d.ttf \ ../data/04_padauk.ttf \ @@ -64,7 +67,7 @@ linux* { MWM_RES.path = $$RESDIR MWM_RES.files = ../data/World.mwm ../data/WorldCoasts.mwm - INSTALLS += target desktop pixmaps icon128 OTHER_RES CLASSIFICATOR_RES SKIN_RES FONT_RES MWM_RES + INSTALLS += target desktop pixmaps icon128 OTHER_RES CLASSIFICATOR_RES MDPI_SKIN_RES XHDPI_SKIN_RES FONT_RES MWM_RES } macx* {