summaryrefslogtreecommitdiffstats
path: root/ui/base/win/dpi.cc
diff options
context:
space:
mode:
authorgirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 17:24:22 +0000
committergirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 17:24:22 +0000
commit3b5540c8fa4eb9c5df915343445615ee55f4dca1 (patch)
tree629ae261960cfb4bd2bef0c8015504e7c0cbab7e /ui/base/win/dpi.cc
parent739c3b8f7e245597db337947dde33f2ac84513b1 (diff)
downloadchromium_src-3b5540c8fa4eb9c5df915343445615ee55f4dca1.zip
chromium_src-3b5540c8fa4eb9c5df915343445615ee55f4dca1.tar.gz
chromium_src-3b5540c8fa4eb9c5df915343445615ee55f4dca1.tar.bz2
Correct title bar size for HiDPI Windows
GetSystemMetrics was reporting title bar height in pixels, but we were interpreting them as DIP. This resulted in a double-scaled title bar. BUG=149881 Review URL: https://chromiumcodereview.appspot.com/12684006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/win/dpi.cc')
-rw-r--r--ui/base/win/dpi.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/base/win/dpi.cc b/ui/base/win/dpi.cc
index 6c22885..75d63bb 100644
--- a/ui/base/win/dpi.cc
+++ b/ui/base/win/dpi.cc
@@ -114,6 +114,11 @@ gfx::Size DIPToScreenSize(const gfx::Size& dip_size) {
return gfx::ToFlooredSize(gfx::ScaleSize(dip_size, GetDeviceScaleFactor()));
}
+int GetSystemMetricsInDIP(int metric) {
+ return static_cast<int>(GetSystemMetrics(metric) /
+ GetDeviceScaleFactor() + 0.5);
+}
+
double GetUndocumentedDPIScale() {
// TODO(girard): Remove this code when chrome is DPIAware.
static double scale = -1.0;